Merge branch 'fix/Creator' into 'develop'

Merge of fix/Creator  门户、CMS、Query增加creator to develop

See merge request o2oa/o2oa!781

o2web/source/o2_core/o2/xDesktop/Access.js

@@ -32,11 +32,21 @@ MWF.xDesktop.Access = MWF.AC = {
         this.getRoleList();
         return this.isAdministrator() || (this.roleList.indexOf("portalmanager")!==-1);
     },
+    isPortalCreator: function(){
+        if (!layout.desktop.session.user.roleList) return false;
+        this.getRoleList();
+        return this.isAdministrator() || (this.roleList.indexOf("portalmanager")!==-1) || (this.roleList.indexOf("portalcreator")!==-1);
+    },
     isQueryManager: function(){
         if (!layout.desktop.session.user.roleList) return false;
         this.getRoleList();
         return this.isAdministrator() || (this.roleList.indexOf("querymanager")!==-1);
     },
+    isQueryCreator: function(){
+        if (!layout.desktop.session.user.roleList) return false;
+        this.getRoleList();
+        return this.isAdministrator() || (this.roleList.indexOf("querymanager")!==-1) || (this.roleList.indexOf("querycreator")!==-1);
+    },
     isOrganizationManager: function(){
         if (!layout.desktop.session.user.roleList) return false;
         this.getRoleList();
@@ -103,7 +113,7 @@ MWF.xDesktop.Access = MWF.AC = {
     },
     isPortalPlatformCreator: function(){
         if (this.isAdministrator()) return true;
-        if (this.isPortalManager()) return true;
+        if (this.isPortalCreator()) return true;
         if (!layout.desktop.session.user.roleList) return false;
         this.getRoleList();
         return (this.roleList.indexOf("portalcreator")!==-1);
@@ -111,7 +121,7 @@ MWF.xDesktop.Access = MWF.AC = {
 
     isQueryPlatformCreator: function(){
         if (this.isAdministrator()) return true;
-        if (this.isQueryManager()) return true;
+        if (this.isQueryCreator()) return true;
         if (!layout.desktop.session.user.roleList) return false;
         this.getRoleList();
         return (this.roleList.indexOf("querycreator")!==-1);
@@ -127,6 +137,10 @@ MWF.xDesktop.Access = MWF.AC = {
         this.getRoleList();
         return this.isAdministrator() || (this.roleList.indexOf("cmsmanager")!==-1);
     },
+    isCMSCreator: function(){
+        this.getRoleList();
+        return this.isAdministrator() || (this.roleList.indexOf("cmsmanager")!==-1) || (this.roleList.indexOf("cmscreator")!==-1);
+    },
     isBBSManager: function(){
         this.getRoleList();
         return this.isAdministrator() || (this.roleList.indexOf("bbsmanager")!==-1) || (this.roleList.indexOf("bssmanager")!==-1);

o2web/source/x_component_cms_Column/Main.js

@@ -102,7 +102,7 @@ MWF.xApplication.cms.Column.Main = new Class({
         }
 
 
-        if (MWF.AC.isCMSManager()) {
+        if (MWF.AC.isCMSCreator()) {
             this.createColumnNode = new Element("div.createColumnNode", {
                 "styles": this.css.createColumnNode,
                 "text": this.lp.column.create