diff options
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/acl.js | 5 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index c129634a0..eb702d2b0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -17,6 +17,9 @@ function ACL(backend_url, preset){ that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); that.showall = $("#acl-showall"); + // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. + that.on_submit(); + if (preset.length==0) that.showall.removeClass("btn-default").addClass("btn-warning"); /*events*/ @@ -26,7 +29,6 @@ function ACL(backend_url, preset){ $(document).on('click','.acl-button-show',that.on_button_show); $(document).on('click','.acl-button-hide',that.on_button_hide); $("#acl-search").keypress(that.on_search); -// $("#acl-wrapper").parents("form").submit(that.on_submit); /* startup! */ that.get(0,100); @@ -269,5 +271,6 @@ ACL.prototype.populate = function(data){ $(el).removeAttr("data-src"); }); that.update_view(); + $('#dbtn-submit, #dbtn-acl').prop('disabled', false); } diff --git a/view/js/main.js b/view/js/main.js index beedb7f01..a55b8fbb1 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -749,7 +749,7 @@ function updateConvItems(mode,data) { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); $(data.notify).each(function() { - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); $("#nav-" + notifyType + "-menu").append(html); }); $(".dropdown-menu img[data-src]").each(function(i, el){ |