Fix for EMM-1665

revert-dabc3590
kamidu 8 years ago
parent 119a3e16c5
commit faf0f36683

@ -139,7 +139,7 @@ function loadNewNotifications() {
$(messageSideBar).html( $(messageSideBar).html(
"<h4 class='text-center'>No New Notifications</h4>" + "<h4 class='text-center'>No New Notifications</h4>" +
"<h5 class='text-center text-muted'>" + "<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>" "</h5>"
); );
} }
@ -368,16 +368,12 @@ $(document).ready(function () {
var redirectUrl = $(this).data("url"); var redirectUrl = $(this).data("url");
var markAsReadNotificationsEpr = emmAdminBasePath + "/notifications/" + notificationId + "/mark-checked"; var markAsReadNotificationsEpr = emmAdminBasePath + "/notifications/" + notificationId + "/mark-checked";
var messageSideBar = ".sidebar-messages"; var messageSideBar = ".sidebar-messages";
invokerUtil.put( invokerUtil.put(
markAsReadNotificationsEpr, markAsReadNotificationsEpr,
null, null,
// on success // on success
function (data) { function (data) {
data = JSON.parse(data); window.location.href = redirectUrl;
if (data.statusCode == responseCodes["ACCEPTED"]) {
location.href = redirectUrl;
}
}, },
// on error // on error
function () { function () {

@ -5,11 +5,10 @@
<li class="message" data-type="selectable" > <li class="message" data-type="selectable" >
<h4> <h4>
<i class="icon fw fw-mobile text-muted"></i> <i class="icon fw fw-mobile text-muted"></i>
<a href="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}" <a data-id="{{id}}"
data-id="{{operationId}}" data-url="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}"
data-url="{{../contextPath}}/device/{{deviceType}}?id={{deviceIdentifier}}" class="new-notification text-capitalize" data-click-event="remove-form">
class="new-notification text-capitalize" data-click-event="remove-form"> Failure on {{deviceType}} {{deviceName}}
Failure on {{deviceType}} {{deviceName}}
</a> </a>
</h4> </h4>
<p>{{description}}</p> <p>{{description}}</p>

Loading…
Cancel
Save