From 9fb5c3fd93d1ea6b5f7b09f4d142e500227d9ce3 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sat, 26 Nov 2016 08:30:54 +0530
Subject: [PATCH] Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845

---
 .../devicemgt/app/conf/config.json            |  3 +-
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.hbs  | 29 +++++++------------
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.js   |  2 --
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 4fb7741b9..434db0a38 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -120,6 +120,5 @@
     "isOAuthEnabled" : true,
     "backendRestEndpoints" : {
         "deviceMgt" : "/api/device-mgt/v1.0"
-    },
-    "deviceStatisticsEnabled" : false
+    }
 }
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
index 864ea7e57..6e3597373 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -22,19 +22,6 @@
 {{/zone}}
 
 {{#zone "navMenu-items"}}
-    <li>
-        <a href="{{@app.context}}">
-            <i class="fw fw-dashboard"></i>
-            System Resources
-        </a>
-    </li>
-    {{#if dashboardAvailable}}
-        {{#if permissions.VIEW_DASHBOARD}}
-            <li><a href="{{serverURL}}/portal/t/{{currentUser.domain}}/dashboards/device-statistics-dashboard/">
-                <i class="fw fw-bar-chart"></i>Device Statistics</a>
-            </li>
-        {{/if}}
-    {{/if}}
     {{#if permissions.LIST_DEVICES}}
         <li>
             <!--suppress HtmlUnknownTarget -->
@@ -44,7 +31,17 @@
             </a>
         </li>
     {{/if}}
-
+    {{#if permissions.VIEW_DASHBOARD}}
+        <li>
+            <a href="{{serverURL}}/portal/t/{{currentUser.domain}}/dashboards/device-statistics-dashboard/">
+                <i class="fw fw-bar-chart"></i>Device Statistics
+            </a>
+        </li>
+    {{/if}}
+    {{#if permissions.LIST_POLICIES}}
+        <li><!--suppress HtmlUnknownTarget -->
+            <a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
+    {{/if}}
     {{#if permissions.USER_MGT_PERMITTED}}
         <li><a><i class="fw fw-user"></i>User Management</a>
             <ul>
@@ -59,10 +56,6 @@
             </ul>
         </li>
     {{/if}}
-    {{#if permissions.LIST_POLICIES}}
-        <li><!--suppress HtmlUnknownTarget -->
-            <a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
-    {{/if}}
     {{#if permissions.CONFIG_MGT_PERMITTED}}
         <li><a><i class="fw fw-settings"></i>Configuration Management</a>
             <ul>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
index 4269d3929..f5f450c35 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
@@ -59,8 +59,6 @@ function onRequest(context) {
     permissions["LIST_NOTIFICATIONS"] = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
     permissions["VIEW_DASHBOARD"] = userModule.isAuthorized("/permission/admin/device-mgt/dashboard/view");
 
-    viewModel["dashboardAvailable"] = mdmProps["deviceStatisticsEnabled"];
-
     viewModel["permissions"] = permissions;
     viewModel["appContext"] = mdmProps["appContext"];
     viewModel["serverURL"] = mdmProps["httpsWebURL"];