Merge branch 'cherry-pick-f1d3be43' into 'wrdp'

Merge branch 'fix/service_manager' into 'master'

See merge request o2oa/o2oa!2576

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

@@ -43,7 +43,11 @@ MWF.xDesktop.Access = MWF.AC = {
         this.getRoleList();
         return this.isAdministrator() || (this.roleList.indexOf("messagemanager")!==-1);
     },
-
+    isServiceManager: function(){
+        if (!layout.desktop.session.user.roleList) return false;
+        this.getRoleList();
+        return this.isAdministrator() || (this.roleList.indexOf("servicemanager")!==-1);
+    },
 
     isUnitManager: function(){
         if (!layout.desktop.session.user.roleList) return false;
@@ -202,4 +206,4 @@ MWF.xDesktop.Access = MWF.AC = {
         //if (!this.action) this.action = new MWF.xApplication.Organization.Actions.RestActions();
     }
 
-}
+}

o2web/source/x_component_service_ServiceManager/AgentExplorer.js

@@ -13,7 +13,7 @@ MWF.xApplication.service.ServiceManager.AgentExplorer = new Class({
         }
     },
     createCreateElementNode: function(){
-        if( MWF.AC.isAdministrator() ) {
+        if( MWF.AC.isServiceManager() ) {
             this.createElementNode = new Element("div", {
                 "styles": this.css.createElementNode,
                 "title": this.options.tooltip.create
@@ -41,7 +41,7 @@ MWF.xApplication.service.ServiceManager.AgentExplorer = new Class({
         this.app.desktop.openApplication(e, "service.AgentDesigner", options);
     },
     loadElementList: function(){
-        if( MWF.AC.isAdministrator() ){
+        if( MWF.AC.isServiceManager() ){
             this._loadItemDataList(function(json){
                 if (json.data.length){
                     json.data.each(function(item){

o2web/source/x_component_service_ServiceManager/InvokeExplorer.js

@@ -13,7 +13,7 @@ MWF.xApplication.service.ServiceManager.InvokeExplorer = new Class({
         }
     },
     createCreateElementNode: function(){
-        if( MWF.AC.isAdministrator() ) {
+        if( MWF.AC.isServiceManager() ) {
             this.createElementNode = new Element("div", {
                 "styles": this.css.createElementNode,
                 "title": this.options.tooltip.create
@@ -41,7 +41,7 @@ MWF.xApplication.service.ServiceManager.InvokeExplorer = new Class({
         this.app.desktop.openApplication(e, "service.InvokeDesigner", options);
     },
     loadElementList: function(){
-        if( MWF.AC.isAdministrator() ){
+        if( MWF.AC.isServiceManager() ){
             this._loadItemDataList(function(json){
                 if (json.data.length){
                     json.data.each(function(item){