aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-15 18:52:27 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-15 18:52:27 +0200
commitdd8d20f089670294beedc9fc181a26e95ed76842 (patch)
treebd97c91c2bb26d2018c11d044e48522e9b389665 /view/js
parent7ae097ef6b59083db9fe9134d10815a2b329b542 (diff)
downloadvolse-hubzilla-dd8d20f089670294beedc9fc181a26e95ed76842.tar.gz
volse-hubzilla-dd8d20f089670294beedc9fc181a26e95ed76842.tar.bz2
volse-hubzilla-dd8d20f089670294beedc9fc181a26e95ed76842.zip
implement groups in the acl select. please notice that selecting *custom selection* now sets an empty (public) acl. it was set to self before...
Diffstat (limited to 'view/js')
-rw-r--r--view/js/acl.js79
1 files changed, 62 insertions, 17 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 411190ac9..9e3acf8e1 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -13,6 +13,7 @@ function ACL(backend_url) {
that.deny_gid = [];
that.group_uids = [];
+ that.selected_id = '';
that.info = $("#acl-info");
that.list = $("#acl-list");
@@ -33,6 +34,10 @@ function ACL(backend_url) {
that.acl_select.change(function(event) {
var option = that.acl_select.val();
+ if(option != 'public' && option != 'onlyme' && option != 'limited') { // selected group
+ that.on_showgroup(event);
+ }
+
if(option == 'public') { // public
that.on_showall(event);
}
@@ -147,18 +152,33 @@ ACL.prototype.on_showall = function(event) {
return true; // return true so that state changes from update_view() will be applied
};
+ACL.prototype.on_showgroup = function(event) {
+ var xid = that.acl_select.children(":selected").val();
+ that.selected_id = that.acl_select.children(":selected").attr('id');
+
+ // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
+ event.stopPropagation();
+
+ that.allow_cid = [];
+ that.allow_gid = [xid];
+ that.deny_cid = [];
+ that.deny_gid = [];
+
+ that.update_view(that.selected_id);
+ that.on_submit();
+
+ return true; // return true so that state changes from update_view() will be applied
+};
+
+
ACL.prototype.on_showlimited = function(event) {
// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
event.stopPropagation();
- if(that.allow_cid.length === 0 && that.allow_gid.length === 0 && that.deny_cid.length === 0 && that.deny_gid.length === 0) {
- that.allow_cid = [that.self[0]];
- }
-
- that.allow_cid = (that.allow_cid || []);
- that.allow_gid = (that.allow_gid || []);
- that.deny_cid = (that.deny_cid || []);
- that.deny_gid = (that.deny_gid || []);
+ that.allow_cid = [];
+ that.allow_gid = [];
+ that.deny_cid = [];
+ that.deny_gid = [];
that.update_view(event.target.value);
that.on_submit();
@@ -237,7 +257,7 @@ ACL.prototype.set_allow = function(itemid) {
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
break;
}
- that.update_view();
+ that.update_view('limited');
};
ACL.prototype.set_deny = function(itemid) {
@@ -261,16 +281,20 @@ ACL.prototype.set_deny = function(itemid) {
if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
break;
}
- that.update_view();
+ that.update_view('limited');
};
ACL.prototype.update_select = function(set) {
+ if(set != 'public' && set != 'onlyme' && set != 'limited') {
+ $('#' + set).prop('selected', true );
+ }
that.showall.prop('selected', set === 'public');
that.onlyme.prop('selected', set === 'onlyme');
that.showlimited.prop('selected', set === 'limited');
};
ACL.prototype.update_view = function(value) {
+
if(that.form_id) {
that.form_id.data('allow_cid', that.allow_cid);
that.form_id.data('allow_gid', that.allow_gid);
@@ -278,7 +302,7 @@ ACL.prototype.update_view = function(value) {
that.form_id.data('deny_gid', that.deny_gid);
}
- if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) {
+ if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
that.list.hide(); //hide acl-list
that.info.show(); //show acl-info
that.update_select('public');
@@ -289,6 +313,17 @@ ACL.prototype.update_view = function(value) {
}
+ else if (that.allow_gid.length === 1 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
+ that.list.hide(); //hide acl-list
+ that.info.hide(); //show acl-info
+ that.selected_id = that.allow_gid[0].substring(0,40);
+ that.update_select(that.selected_id);
+
+ /* jot acl */
+ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
+ $('.profile-jot-net input').attr('disabled', 'disabled');
+ }
+
// if value != 'onlyme' we should fall through this one
else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
that.list.hide(); //hide acl-list
@@ -306,10 +341,16 @@ ACL.prototype.update_view = function(value) {
that.update_select('limited');
/* jot acl */
- $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
- $('.profile-jot-net input').attr('disabled', 'disabled');
-
+ if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'limited') {
+ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
+ $('.profile-jot-net input').attr('disabled', false);
+ }
+ else {
+ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
+ $('.profile-jot-net input').attr('disabled', 'disabled');
+ }
}
+
$("#acl-list-content .acl-list-item").each(function() {
$(this).removeClass("groupshow grouphide");
});
@@ -384,9 +425,13 @@ ACL.prototype.populate = function(data) {
$(data.items).each(function(){
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
- if (this.uids !== undefined) that.group_uids[this.xid] = this.uids;
- if (this.self === 'abook-self') that.self[0] = this.xid;
- //console.log(html);
+ if (this.uids !== undefined) {
+ that.group_uids[this.xid] = this.uids;
+ that.onlyme.before($('<option></option>').attr('id', this.xid.substring(0,40)).attr('value', this.xid).text(this.name));
+ }
+ if (this.self === 'abook-self') {
+ that.self[0] = this.xid;
+ }
that.list_content.append(html);
});
$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) {