Merge pull request #776 from rasika/master

Fixing https://github.com/wso2/product-iots/issues/431

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js

@@ -98,6 +98,7 @@ function loadNewNotifications() {
                     var responsePayload = JSON.parse(data);
 
                     if (responsePayload.notifications) {
+                        viewModel.context = context;
                         viewModel.notifications = responsePayload.notifications;
                         if (responsePayload.count > 0) {
                             $(messageSideBar).html(template(viewModel));
@@ -427,7 +428,7 @@ $(document).ready(function () {
     $("#right-sidebar").on("click", ".new-notification", function () {
         var notificationId = $(this).data("id");
         var redirectUrl = $(this).data("url");
-        var markAsReadNotificationsAPI = "/mdm-admin/notifications/" + notificationId + "/CHECKED";
+        var markAsReadNotificationsAPI = "/api/device-mgt/v1.0/notifications/" + notificationId + "/mark-checked";
         var messageSideBar = ".sidebar-messages";
 
         invokerUtil.put(

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/templates/notifications.hbs

@@ -2,11 +2,11 @@
     <li class="message message-info" data-type="selectable" >
         <h4>
             <i class="icon fw fw-info"></i>
-            <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
-               data-id="{{notificationId}}"
-               data-url="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
+            <a href="{{../context}}/device/{{deviceType}}?id={{deviceIdentifier}}"
+               data-id="{{id}}"
+               data-url="device?type={{deviceType}}&id={{deviceIdentifier}}"
                class="new-notification" data-click-event="remove-form">
-                Device Type : {{deviceIdentifier.type}}
+                {{deviceType}} : {{deviceName}}
             </a>
         </h4>
         <p>{{description}}</p>