From f259063f08915f7219f3fe070a15d096b439fb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 8 Oct 2020 18:08:04 -0400
Subject: [PATCH] fix: #8728, dont add admins to table

---
 public/language/en-GB/admin/manage/privileges.json | 3 ++-
 public/src/admin/manage/privileges.js              | 6 ++++++
 public/src/modules/autocomplete.js                 | 5 +----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json
index 7295c0010335..ac83a28a934a 100644
--- a/public/language/en-GB/admin/manage/privileges.json
+++ b/public/language/en-GB/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
 	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges"
 }
\ No newline at end of file
diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js
index 86cdeccb9048..69ad97cfe5f0 100644
--- a/public/src/admin/manage/privileges.js
+++ b/public/src/admin/manage/privileges.js
@@ -256,6 +256,12 @@ define('admin/manage/privileges', [
 			inputEl.focus();
 
 			autocomplete.group(inputEl, function (ev, ui) {
+				if (ui.item.group.name === 'administrators') {
+					return app.alert({
+						type: 'warning',
+						message: '[[admin/manage/privileges:alert.admin-warning]]',
+					});
+				}
 				addGroupToCategory(ui.item.group.name, function () {
 					modal.modal('hide');
 				});
diff --git a/public/src/modules/autocomplete.js b/public/src/modules/autocomplete.js
index b71f4a846c33..d8259e6a96b4 100644
--- a/public/src/modules/autocomplete.js
+++ b/public/src/modules/autocomplete.js
@@ -21,8 +21,7 @@ define('autocomplete', function () {
 					handleOnSelect(input, onselect, event, ui);
 				},
 				source: function (request, response) {
-					params.query = params.query || request.term;
-					params.paginate = params.paginate || false;
+					params.query = request.term;
 
 					socket.emit('user.search', params, function (err, result) {
 						if (err) {
@@ -51,8 +50,6 @@ define('autocomplete', function () {
 						}
 
 						$('.ui-autocomplete a').attr('data-ajaxify', 'false');
-						delete params.query;
-						delete params.paginate;
 					});
 				},
 			});