diff options
| author | Max Kostikov <max@kostikov.co> | 2019-10-14 11:11:48 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-10-14 11:11:48 +0200 |
| commit | b4de492e0df562cac7955453161848f297d160b8 (patch) | |
| tree | f87f24ff26bd83918bf7389f46bfe4527f7b7536 | |
| parent | 5bf3114e6f4f8d78eec887467f93beb2ab34724b (diff) | |
| parent | e7e8a2ca5f09737b27377188794d18fc992febb2 (diff) | |
| download | volse-hubzilla-b4de492e0df562cac7955453161848f297d160b8.tar.gz volse-hubzilla-b4de492e0df562cac7955453161848f297d160b8.tar.bz2 volse-hubzilla-b4de492e0df562cac7955453161848f297d160b8.zip | |
Merge branch 'dev' into 'dev'
Dev
See merge request kostikov/core!2
| -rw-r--r-- | view/js/acl.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 730b515a0..9415113dd 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -207,7 +207,7 @@ ACL.prototype.on_button_hide = function(event) { ACL.prototype.set_allow = function(itemid) { type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); switch(type) { case "g": if (that.allow_gid.indexOf(id)<0) { @@ -231,7 +231,7 @@ ACL.prototype.set_allow = function(itemid) { ACL.prototype.set_deny = function(itemid) { type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); switch(type) { case "g": if (that.deny_gid.indexOf(id)<0) { @@ -310,8 +310,12 @@ ACL.prototype.update_view = function(value) { else { that.list.show(); //show acl-list + datasrc2src('#acl-list-content .list-group-item img[data-src]'); that.info.hide(); //hide acl-info that.update_select('custom'); + if(typeof value === 'undefined') { + value = 'custom'; + } /* jot acl */ if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') { @@ -334,7 +338,7 @@ ACL.prototype.update_view = function(value) { $("#acl-list-content .acl-list-item").each(function() { itemid = $(this).attr('id'); type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success"); bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger"); |