Merge pull request #13028 from MrPetovan/bug/13026-message_recipient.tpl
Separate JSON output of contact lists in message_recipient template
This commit is contained in:
commit
7295b2c40c
|
@ -66,7 +66,8 @@ class ACL
|
||||||
|
|
||||||
$tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
|
$tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
|
||||||
$o = Renderer::replaceMacros($tpl, [
|
$o = Renderer::replaceMacros($tpl, [
|
||||||
'$contacts' => json_encode($contacts),
|
'$contacts' => $contacts,
|
||||||
|
'$contacts_json' => json_encode($contacts),
|
||||||
'$selected' => $selected,
|
'$selected' => $selected,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
let $recipient_input = $('[name="recipient"]');
|
let $recipient_input = $('[name="recipient"]');
|
||||||
|
|
||||||
let acl = new Bloodhound({
|
let acl = new Bloodhound({
|
||||||
local: {{$contacts nofilter}},
|
local: {{$contacts_json nofilter}},
|
||||||
identify: function(obj) { return obj.id.toString(); },
|
identify: function(obj) { return 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,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user