diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-21 10:22:30 +1100 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-21 10:22:30 +1100 |
| commit | 48e62bb50a4fade3724d81558dc5209973a57e8c (patch) | |
| tree | 44d5c69c21ebc650b449acfe2d6fc704e994ef0b /view | |
| parent | 23151100dee1051d77d893a616cbc166eb5dcca1 (diff) | |
| parent | 1ddb43b0d32ab0dadb3fabc1ed79c96c4365eb77 (diff) | |
| download | volse-hubzilla-48e62bb50a4fade3724d81558dc5209973a57e8c.tar.gz volse-hubzilla-48e62bb50a4fade3724d81558dc5209973a57e8c.tar.bz2 volse-hubzilla-48e62bb50a4fade3724d81558dc5209973a57e8c.zip | |
Merge pull request #329 from git-marijus/master
fix #328 by using a seperate query instead of group_concat
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/acl.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 70440b572..65f1009ed 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -121,8 +121,10 @@ ACL.prototype.on_button_show = function(event) { event.stopImmediatePropagation(); event.stopPropagation(); - that.set_allow($(this).parent().attr('id')); - that.on_submit(); + if(!$(this).parent().hasClass("grouphide")) { + that.set_allow($(this).parent().attr('id')); + that.on_submit(); + } return false; }; @@ -245,12 +247,15 @@ ACL.prototype.update_view = function() { break; case "c": if (that.allow_cid.indexOf(id)>=0){ - btshow.removeClass("btn-default").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-default"); + if(!$(this).hasClass("grouphide") ) { + btshow.removeClass("btn-default").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-default"); + } } if (that.deny_cid.indexOf(id)>=0){ btshow.removeClass("btn-success").addClass("btn-default"); bthide.removeClass("btn-default").addClass("btn-danger"); + $(this).removeClass("groupshow"); } } }); |