aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-11-16 09:34:08 +0000
committerMario <mario@mariovavti.com>2020-11-16 09:34:08 +0000
commit5750e6cada69b03b35a294c4dae7f9433130449b (patch)
tree2abade7504c55ecb9ee13b8aa232af695d0460a0 /view/js
parent394aa76a8f330bdb55f726e4a83258d02c9f709a (diff)
parent35c4deb88481fafe37eefab120438d68082568be (diff)
downloadvolse-hubzilla-5750e6cada69b03b35a294c4dae7f9433130449b.tar.gz
volse-hubzilla-5750e6cada69b03b35a294c4dae7f9433130449b.tar.bz2
volse-hubzilla-5750e6cada69b03b35a294c4dae7f9433130449b.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view/js')
-rw-r--r--view/js/acl.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 4597184ea..940fdaa44 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -340,7 +340,13 @@ ACL.prototype.update_view = function(value) {
that.list.hide(); //hide acl-list
that.info.hide(); //show acl-info
that.selected_id = that.contact_ids[that.allow_cid[0]];
- that.update_select('\\^' + that.selected_id);
+
+ if(that.acl_select.find('option[id="\\^' + that.selected_id + '"]').length === 0) {
+ that.update_view('custom');
+ }
+ else {
+ that.update_select('\\^' + that.selected_id);
+ }
/* jot acl */
$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');