From 74cc9d00fa4f8b831f325776b765590fccb7f801 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 7 Dec 2019 05:50:15 -0500
Subject: [PATCH] Allow contacts and groups with same ID in ACL selector

---
 view/templates/acl_selector.tpl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index 4da7862bb1..a5929900b3 100644
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -130,19 +130,19 @@
 		// Custom visibility tags inputs
 		let acl_groups = new Bloodhound({
 			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']),
 			queryTokenizer: Bloodhound.tokenizers.whitespace,
 		});
 		let acl_contacts = new Bloodhound({
 			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']),
 			queryTokenizer: Bloodhound.tokenizers.whitespace,
 		});
 		let acl = new Bloodhound({
 			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']),
 			queryTokenizer: Bloodhound.tokenizers.whitespace,
 		});
@@ -163,7 +163,7 @@
 						return 'label label-info';
 				}
 			},
-			itemValue: 'id',
+			itemValue: function (item) { return item.type + '-' + item.id.toString(); },
 			itemText: 'name',
 			itemThumb: 'micro',
 			itemTitle: function(item) {
@@ -191,7 +191,7 @@
 							return 'label label-info';
 					}
 				},
-				itemValue: 'id',
+				itemValue: function (item) { return item.type + '-' + item.id.toString(); },
 				itemText: 'name',
 				itemThumb: 'micro',
 				itemTitle: function(item) {
@@ -209,17 +209,17 @@
 
 		// Import existing ACL into the tags input fields.
 
-		$group_allow_input.val().split(',').forEach(function (val) {
-			$acl_allow_input.tagsinput('add', acl_groups.get(val)[0]);
+		$group_allow_input.val().split(',').forEach(function (group_id) {
+			$acl_allow_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]);
 		});
-		$contact_allow_input.val().split(',').forEach(function (val) {
-			$acl_allow_input.tagsinput('add', acl_contacts.get(val)[0]);
+		$contact_allow_input.val().split(',').forEach(function (contact_id) {
+			$acl_allow_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]);
 		});
-		$group_deny_input.val().split(',').forEach(function (val) {
-			$acl_deny_input.tagsinput('add', acl_groups.get(val)[0]);
+		$group_deny_input.val().split(',').forEach(function (group_id) {
+			$acl_deny_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]);
 		});
-		$contact_deny_input.val().split(',').forEach(function (val) {
-			$acl_deny_input.tagsinput('add', acl_contacts.get(val)[0]);
+		$contact_deny_input.val().split(',').forEach(function (contact_id) {
+			$acl_deny_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]);
 		});
 
 		// Anti-duplicate callback + acl fields value generation