bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7913 from MrPetovan/bug/7902-acl-fixes

Browse source 
Allow contacts and groups with same ID in ACL selector
This commit is contained in:
Michael Vogel 2019-12-07 13:17:43 +01:00 committed by GitHub
commit 1de81716b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
view/templates/acl_selector.tpl
View file

@ -130,19 +130,19 @@
// Custom visibility tags inputs // Custom visibility tags inputs
let acl_groups = new Bloodhound({ let acl_groups = new Bloodhound({
local: {{$acl_groups|@json_encode nofilter}}, local: {{$acl_groups|@json_encode nofilter}},
identify: function(obj) { return obj.id; }, identify: function(obj) { return obj.type + '-' + obj.id.toString(); },
datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name']), datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name']),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
}); });
let acl_contacts = new Bloodhound({ let acl_contacts = new Bloodhound({
local: {{$acl_contacts|@json_encode nofilter}}, local: {{$acl_contacts|@json_encode nofilter}},
identify: function(obj) { return obj.id; }, identify: function(obj) { return obj.type + '-' + obj.id.toString(); },
datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
}); });
let acl = new Bloodhound({ let acl = new Bloodhound({
local: {{$acl_list|@json_encode nofilter}}, local: {{$acl_list|@json_encode nofilter}},
identify: function(obj) { return obj.id; }, identify: function(obj) { return obj.type + '-' + obj.id.toString(); },
datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
}); });
@ -163,7 +163,7 @@
return 'label label-info'; return 'label label-info';
} }
}, },
itemValue: 'id', itemValue: function (item) { return item.type + '-' + item.id.toString(); },
itemText: 'name', itemText: 'name',
itemThumb: 'micro', itemThumb: 'micro',
itemTitle: function(item) { itemTitle: function(item) {
@ -191,7 +191,7 @@
return 'label label-info'; return 'label label-info';
} }
}, },
itemValue: 'id', itemValue: function (item) { return item.type + '-' + item.id.toString(); },
itemText: 'name', itemText: 'name',
itemThumb: 'micro', itemThumb: 'micro',
itemTitle: function(item) { itemTitle: function(item) {
@ -209,17 +209,17 @@
// Import existing ACL into the tags input fields. // Import existing ACL into the tags input fields.
$group_allow_input.val().split(',').forEach(function (val) { $group_allow_input.val().split(',').forEach(function (group_id) {
$acl_allow_input.tagsinput('add', acl_groups.get(val)[0]); $acl_allow_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]);
}); });
$contact_allow_input.val().split(',').forEach(function (val) { $contact_allow_input.val().split(',').forEach(function (contact_id) {
$acl_allow_input.tagsinput('add', acl_contacts.get(val)[0]); $acl_allow_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]);
}); });
$group_deny_input.val().split(',').forEach(function (val) { $group_deny_input.val().split(',').forEach(function (group_id) {
$acl_deny_input.tagsinput('add', acl_groups.get(val)[0]); $acl_deny_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]);
}); });
$contact_deny_input.val().split(',').forEach(function (val) { $contact_deny_input.val().split(',').forEach(function (contact_id) {
$acl_deny_input.tagsinput('add', acl_contacts.get(val)[0]); $acl_deny_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]);
}); });
// Anti-duplicate callback + acl fields value generation // Anti-duplicate callback + acl fields value generation