From b12032273239ea8d9cd4bd4157e8b213a4913457 Mon Sep 17 00:00:00 2001 From: Jovan Jovanovic Date: Wed, 4 Aug 2021 23:09:58 +0200 Subject: [PATCH] Fix something I think --- .../views/admin/users/notifications.blade.php | 104 ++++++++---------- 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/resources/views/admin/users/notifications.blade.php b/resources/views/admin/users/notifications.blade.php index e4390903..ac7cb522 100644 --- a/resources/views/admin/users/notifications.blade.php +++ b/resources/views/admin/users/notifications.blade.php @@ -124,71 +124,63 @@ ] }) - $('#users').select2({ - ajax: { - url: '/admin/users.json', - dataType: 'json', - delay: 250, + function initUserSelect(data) { + $('#users').select2({ + ajax: { + url: '/admin/users.json', + dataType: 'json', + delay: 250, - data: function (params) { - return { - filter: { email: params.term }, - page: params.page, - }; + data: function (params) { + return { + filter: { email: params.term }, + page: params.page, + }; + }, + + processResults: function (data, params) { + return { results: data }; + }, + + cache: true, }, + data: data, + minimumInputLength: 2, + templateResult: function (data) { + if (data.loading) return data.text; + const $container = $( + "
" + + "
" + + "
" + + "
" + + "" + + "
" + + "
" + ); - processResults: function (data, params) { - return { results: data }; + $container.find(".select2-result-users__username").text(data.name); + $container.find(".select2-result-users__email").text(data.email); + + return $container; }, - - cache: true, - }, - minimumInputLength: 2, - templateResult: function (data) { - if (data.loading) return escapeHtml(data.text); - const $container = $( - "
" + - "
" + - "
" + - "
" + - "" + - "
" + - "
" - ); - - $container.find(".select2-result-repository__username").text(data.name); - $container.find(".select2-result-repository__email").text(data.email); - - return $container; - {{-- return $('
\ - User Image \ - \ - ' + escapeHtml(data.name) +' \ - \ - ' + escapeHtml(data.email) + ' \ -
'); --}} - }, - templateSelection: function (data) { - return $('
\ - \ - User Image \ - \ - \ - ' + escapeHtml(data.name) +' \ - \ -
'); - } - }) + templateSelection: function (data) { + $container = $('
\ + \ + User Image \ + \ + \ +
'); + $container.find(".select2-selection-users__username").text(data.name); + return $container; + } + }) + } + initUserSelect() }) function toggleClass(id, className) { document.getElementById(id).classList.toggle(className) } - function escapeHtml(str) { - var div = document.createElement('div'); - div.appendChild(document.createTextNode(str)); - return div.innerHTML; - }