From faf0f36683e4109e1014d4a5c4de13e575cd3e1e Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Tue, 4 Oct 2016 13:27:21 +0530
Subject: [PATCH] Fix for EMM-1665

---
 .../mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js    | 8 ++------
 .../public/templates/notifications.hbs                   | 9 ++++-----
 2 files changed, 6 insertions(+), 11 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 865bd38659..9ac010b44a 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
@@ -139,7 +139,7 @@ function loadNewNotifications() {
                                 $(messageSideBar).html(
                                     "<h4 class='text-center'>No New Notifications</h4>" +
                                     "<h5 class='text-center text-muted'>" +
-                                        "Check this section for error notifications<br>related to device operations" +
+                                    "Check this section for error notifications<br>related to device operations" +
                                     "</h5>"
                                 );
                             }
@@ -368,16 +368,12 @@ $(document).ready(function () {
         var redirectUrl = $(this).data("url");
         var markAsReadNotificationsEpr = emmAdminBasePath + "/notifications/" + notificationId + "/mark-checked";
         var messageSideBar = ".sidebar-messages";
-
         invokerUtil.put(
             markAsReadNotificationsEpr,
             null,
             // on success
             function (data) {
-                data = JSON.parse(data);
-                if (data.statusCode == responseCodes["ACCEPTED"]) {
-                    location.href = redirectUrl;
-                }
+                window.location.href = redirectUrl;
             },
             // on error
             function () {
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 c80eecb97e..5875fffdf2 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,11 +5,10 @@
     <li class="message" data-type="selectable" >
         <h4>
             <i class="icon fw fw-mobile text-muted"></i>
-            <a href="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
-               data-id="{{operationId}}"
-               data-url="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
-               class="new-notification text-capitalize" data-click-event="remove-form">
-               Failure on {{deviceType}} {{deviceName}}
+            <a  data-id="{{id}}"
+                data-url="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
+                class="new-notification text-capitalize" data-click-event="remove-form">
+                Failure on {{deviceType}} {{deviceName}}
             </a>
         </h4>
         <p>{{description}}</p>