From 6d3fbc422ff68d19635a10188ab5bd2203af1713 Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Tue, 15 Nov 2016 22:59:12 +0530
Subject: [PATCH] Adding link for the dashboard in tenant mode

---
 .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs         | 2 +-
 .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 6420510a6..80d6026fc 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
@@ -75,7 +75,7 @@
         </li>
     {{/if}}
     {{#if permissions.VIEW_DASHBOARD}}
-        <li><a href="{{serverURL}}/portal/dashboards/emm-analytics-dashboard/">
+        <li><a href="{{serverURL}}/portal/t/{{currentUser.domain}}/dashboards/emm-analytics-dashboard/">
             <i class="fw fw-pie-chart"></i>Device Management Dashboard</a>
         </li>
     {{/if}}
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 34500e206..41615c6a6 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,7 @@ function onRequest(context) {
     permissions["LIST_NOTIFICATIONS"] = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
 
     // Restricting the dashboard menu only for super-tenant users
-    permissions["VIEW_DASHBOARD"] = userModule.isAuthorized("/permission/admin/device-mgt/dashboard/view") &&
-        (viewModel["currentUser"].domain == superTenant.domain);
+    permissions["VIEW_DASHBOARD"] = userModule.isAuthorized("/permission/admin/device-mgt/dashboard/view");
 
     viewModel["permissions"] = permissions;
     viewModel["appContext"] = mdmProps["appContext"];