Merge branch 'fix/org_access' into 'develop'

Merge of fix/org_access to develop 修改组织管理权限，修复RoleManager无法管理角色的问题

See merge request o2oa/o2oa!206

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

@@ -66,7 +66,6 @@ MWF.xDesktop.Access = MWF.AC = {
         return this.isAdministrator() || (this.roleList.indexOf("personmanager")!==-1);
     },
 
-
     isGroupCreator: function(){
         if (!layout.desktop.session.user.roleList) return false;
         this.getRoleList();

o2web/source/x_component_Org/$Main/startMenu.json

@@ -3,24 +3,35 @@
 		"title": MWF.xApplication.Org.LP.unitList,
 		"id": "1.1",
 		"action": "orgConfig",
-		"icon": "org"
+		"icon": "org",
+		"display": true
 	},
 	{
 		"title": MWF.xApplication.Org.LP.groupList,
 		"id": "1.1",
 		"action": "groupConfig",
-		"icon": "group"
+		"icon": "group",
+		"display": true
+	},
+	{
+		"title": MWF.xApplication.Org.LP.roleList,
+		"id": "1.1",
+		"action": "roleConfig",
+		"icon": "role",
+		"display": (o2.AC.isOrganizationManager() || o2.AC.isRoleManager())
 	},
-//	{
-//		"title": "角色管理",
-//		"id": "1.1",
-//		"action": "roleConfig",
-//		"icon": "role.png"
-//	},
 	{
 		"title": MWF.xApplication.Org.LP.personList,
 		"id": "1.1",
 		"action": "personConfig",
-		"icon": "person"
+		"icon": "person",
+		"display": true
+	},
+	{
+		"title": MWF.xApplication.Org.LP.personImport,
+		"id": "1.1",
+		"action": "personImport",
+		"icon": "xls",
+		"display": o2.AC.isOrganizationManager()
 	}
 ]
\ No newline at end of file

o2web/source/x_component_Org/$Main/startMenu_admin.json

-[
-	{
-		"title": MWF.xApplication.Org.LP.unitList,
-		"id": "1.1",
-		"action": "orgConfig",
-		"icon": "org"
-	},
-	{
-		"title": MWF.xApplication.Org.LP.groupList,
-		"id": "1.1",
-		"action": "groupConfig",
-		"icon": "group"
-	},
-	{
-		"title": MWF.xApplication.Org.LP.roleList,
-		"id": "1.1",
-		"action": "roleConfig",
-		"icon": "role"
-	},
-	{
-		"title": MWF.xApplication.Org.LP.personList,
-		"id": "1.1",
-		"action": "personConfig",
-		"icon": "person"
-	},
-	{
-		"title": MWF.xApplication.Org.LP.personImport,
-		"id": "1.1",
-		"action": "personImport",
-		"icon": "xls"
-	}
-]
\ No newline at end of file

o2web/source/x_component_Org/Main.js

@@ -252,33 +252,36 @@ MWF.xApplication.Org.Menu = new Class({
 		this.load();
 	},
 	load: function(){
-		var menuUrl = (MWF.AC.isOrganizationManager()) ? this.app.path+"startMenu_admin.json" : this.app.path+"startMenu.json";
+		//var menuUrl = (MWF.AC.isOrganizationManager()) ? this.app.path+"startMenu_admin.json" : this.app.path+"startMenu.json";
+		var menuUrl = this.app.path+"startMenu.json";
 
 		MWF.getJSON(menuUrl, function(json){
 			json.each(function(navi){
-				var naviNode = new Element("div", {
-					"styles": this.app.css.startMenuNaviNode,
-					"title": navi.title
-				});
-				naviNode.store("naviData", navi);
-				
-				var iconNode =  new Element("div", {
-					"styles": this.app.css.startMenuIconNode
-				}).inject(naviNode);
-				iconNode.setStyle("background-image", "url("+this.app.path+this.app.options.style+"/icon/"+navi.icon+"60.png)");
-				
-				var textNode =  new Element("div", {
-					"styles": this.app.css.startMenuTextNode,
-					"text": navi.title
-				});
-				textNode.inject(naviNode);
-				naviNode.inject(this.node);
-				
-				this.startNavis.push(naviNode);
-				
-				this.setStartNaviEvent(naviNode, navi);
-				
-				this.setNodeCenter(this.node);
+				if (navi.display){
+					var naviNode = new Element("div", {
+						"styles": this.app.css.startMenuNaviNode,
+						"title": navi.title
+					});
+					naviNode.store("naviData", navi);
+
+					var iconNode =  new Element("div", {
+						"styles": this.app.css.startMenuIconNode
+					}).inject(naviNode);
+					iconNode.setStyle("background-image", "url("+this.app.path+this.app.options.style+"/icon/"+navi.icon+"60.png)");
+
+					var textNode =  new Element("div", {
+						"styles": this.app.css.startMenuTextNode,
+						"text": navi.title
+					});
+					textNode.inject(naviNode);
+					naviNode.inject(this.node);
+
+					this.startNavis.push(naviNode);
+
+					this.setStartNaviEvent(naviNode, navi);
+
+					this.setNodeCenter(this.node);
+				}
 			}.bind(this));
 			this.setStartMenuWidth();