From 2206e258d113c841a3c8c2c89f5998c85677f1be Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Sun, 15 Jan 2017 23:40:00 +0530
Subject: [PATCH] Fixing permissions for [devicemgt-user] and [devicemgt-admin]
 roles

---
 .../jaggeryapps/devicemgt/app/modules/init.js | 16 ++++----
 .../cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs | 38 +++++++++----------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/init.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/init.js
index bc0fa5abb04..4815edd59d0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/init.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/init.js
@@ -29,13 +29,15 @@ var carbonServer = new carbonModule.server.Server({
 application.put("carbonServer", carbonServer);
 
 var permissions = {
-    "/permission/admin/device-mgt/devices/enroll": ["ui.execute"],
-    "/permission/admin/device-mgt/devices/disenroll": ["ui.execute"],
-    "/permission/admin/device-mgt/devices/owning-device": ["ui.execute"],
-    "/permission/admin/device-mgt/groups": ["ui.execute"],
-    "/permission/admin/device-mgt/notifications": ["ui.execute"],
-    "/permission/admin/device-mgt/policies": ["ui.execute"],
-    "/permission/admin/manage/api/subscribe": ["ui.execute"]
+    "/permission/admin/Login": ["ui.execute"]
 };
 
+var adminPermissions = {
+    "/permission/admin": ["ui.execute"]
+};
+
+//On Startup, admin user will get both roles: devicemgt-admin and devicemgt-user
+//Average user through sign-up will only receive the role: devicemgt-user.
+//Admin can setup necessary permissions for the role: devicemgt-user
 userModule.addRole("internal/devicemgt-user", ["admin"], permissions);
+userModule.addRole("internal/devicemgt-admin", ["admin"], adminPermissions);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 21687eef226..51d087ca345 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -45,33 +45,33 @@
             </a>
         </li>
     {{/if}}
-    <li><a><i class="fw fw-user"></i>User Management</a>
-        <ul>
-            {{#if permissions.LIST_USERS}}
-                <li><a href="{{@app.context}}/users"><i class="fw fw-user"></i>Users</a></li>
-            {{/if}}
+    {{#if userMgtEnabled}}
+        <li><a><i class="fw fw-user"></i>User Management</a>
+            <ul>
+                {{#if permissions.LIST_USERS}}
+                    <li><a href="{{@app.context}}/users"><i class="fw fw-user"></i>Users</a></li>
+                {{/if}}
 
-            {{#if permissions.LIST_ROLES}}
-                <li><a href="{{@app.context}}/roles"><i class="fw fw-bookmark"></i>Roles</a></li>
-            {{/if}}
-        </ul>
-    </li>
+                {{#if permissions.LIST_ROLES}}
+                    <li><a href="{{@app.context}}/roles"><i class="fw fw-bookmark"></i>Roles</a></li>
+                {{/if}}
+            </ul>
+        </li>
+    {{/if}}
     {{#if permissions.LIST_POLICIES}}
         <li><a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
     {{/if}}
-    <li><a><i class="fw fw-settings"></i>Configuration Management</a>
-        <ul>
-            {{#if permissions.TENANT_CONFIGURATION}}
+    {{#if permissions.TENANT_CONFIGURATION}}
+        <li><a><i class="fw fw-settings"></i>Configuration Management</a>
+            <ul>
                 <li><a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>Platform Configurations</a>
                 </li>
-            {{/if}}
-            <!-- todo change the permission and get the related permission -->
-            {{#if permissions.TENANT_CONFIGURATION}}
+                <!-- todo change the permission and get the related permission -->
                 <li><a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>Certificate Configurations</a>
                 </li>
-            {{/if}}
-        </ul>
-    </li>
+            </ul>
+        </li>
+    {{/if}}
 {{/zone}}
 
 {{#zone "navbarCollapsableRightItems"}}