community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rasika Perera 2017-06-15 11:27:37 +05:30
parent 7e83b53bb4
commit 61c4db07a3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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
View File

@ -98,6 +98,7 @@ function loadNewNotifications() {
var responsePayload = JSON.parse(data); var responsePayload = JSON.parse(data);
if (responsePayload.notifications) { if (responsePayload.notifications) {
viewModel.context = context;
viewModel.notifications = responsePayload.notifications; viewModel.notifications = responsePayload.notifications;
if (responsePayload.count > 0) { if (responsePayload.count > 0) {
$(messageSideBar).html(template(viewModel)); $(messageSideBar).html(template(viewModel));
@ -427,7 +428,7 @@ $(document).ready(function () {
$("#right-sidebar").on("click", ".new-notification", function () { $("#right-sidebar").on("click", ".new-notification", function () {
var notificationId = $(this).data("id"); var notificationId = $(this).data("id");
var redirectUrl = $(this).data("url"); 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"; var messageSideBar = ".sidebar-messages";
invokerUtil.put( invokerUtil.put(

8
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
View File

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