From 19a2c1d1bd62eb9e981552cde41619cf37bdc16c Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Mon, 3 Oct 2016 11:50:57 +0530
Subject: [PATCH] Fix for Jira issue : EMM-1639

---
 .../units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js   | 1 +
 .../public/templates/notifications.hbs                        | 4 ++--
 2 files changed, 3 insertions(+), 2 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/public/js/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/public/js/nav-menu.js
index 86cde4124e..865bd38659 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/public/js/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/public/js/nav-menu.js
@@ -133,6 +133,7 @@ function loadNewNotifications() {
                         if (responsePayload["notifications"]) {
                             if (responsePayload.count > 0) {
                                 viewModel["notifications"] = responsePayload["notifications"];
+                                viewModel.contextPath = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
                                 $(messageSideBar).html(
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/public/templates/notifications.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/public/templates/notifications.hbs
index cbbe199763..c80eecb97e 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/public/templates/notifications.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/public/templates/notifications.hbs
@@ -5,9 +5,9 @@
     <li class="message" data-type="selectable" >
         <h4>
             <i class="icon fw fw-mobile text-muted"></i>
-            <a href="device/{{deviceType}}?id={{deviceIdentifier}}"
+            <a href="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
                data-id="{{operationId}}"
-               data-url="device/{{deviceType}}?id={{deviceIdentifier}}"
+               data-url="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
                class="new-notification text-capitalize" data-click-event="remove-form">
                Failure on {{deviceType}} {{deviceName}}
             </a>