Fix for the redirection and ui related issues

revert-70aa11f8
kamidu 8 years ago
parent 31f9134bac
commit 1fe74905f2

@ -411,7 +411,5 @@ $(document).ready(function () {
if (!$("#can-invite").val()) {
$("#invite-user-button").remove();
}
$(".viewEnabledIcon").click(function () {
InitiateViewOption();
});
});

@ -25,8 +25,7 @@ $.fn.datatables_extended = function(settings){
// EMM related function
if (InitiateViewOption) {
$(".viewEnabledIcon").unbind("click");
$(".viewEnabledIcon").bind("click", InitiateViewOption);
$(document).on('click','.viewEnabledIcon',InitiateViewOption);
}
//--- End of EMM related codes

@ -22,7 +22,7 @@
<!-- content -->
<div id="config-save-form" class="container col-centered wr-content">
<br>
Device Notifications
<h4> Device Notifications </h4>
<br>
<br>
<div class="wr-advance-operations">

@ -65,6 +65,15 @@ function loadNotifications() {
function showAdvanceOperation(operation, button) {
$(button).addClass('selected');
$(button).siblings().removeClass('selected');
if ($(button).attr("id") == 'allNotifications') {
$("#ast-container").html('<div class="panel-body">You do not have any unread notifications </div>');
} else if ($(button).attr("id") == 'unReadNotifications') {
$("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
} else {
$("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
}
var hiddenOperation = ".wr-hidden-operations-content > div";
$(hiddenOperation + '[data-operation="' + operation + '"]').show();
$(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
@ -82,7 +91,7 @@ $(document).ready(function () {
loadNotifications();
$("#ast-container").on("click", ".new-notification", function(e) {
$("#ast-container").on("click", ".new-notification", function (e) {
var notificationId = $(this).data("id");
// var redirectUrl = $(this).data("url");
var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked";

Loading…
Cancel
Save