diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json
index 7295c00103..ac83a28a93 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 all categories?",
"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to all descendant (child) categories?",
"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to all descendant (child) categories?",
- "alert.no-undo": "This action cannot be undone."
+ "alert.no-undo": "This action cannot be undone.",
+ "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 86cdeccb90..69ad97cfe5 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 b71f4a846c..d8259e6a96 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;
});
},
});