diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/en-GB/admin/manage/privileges.json +++ b/public/language/en-GB/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Chat", "upload-images": "Upload Images", "upload-files": "Upload Files", diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js index 424d12881e..0fab84ed20 100644 --- a/public/src/admin/manage/privileges.js +++ b/public/src/admin/manage/privileges.js @@ -29,7 +29,7 @@ define('admin/manage/privileges', [ }; Privileges.setupPrivilegeTable = function () { - $('.privilege-table-container').on('change', 'input[type="checkbox"]', function () { + $('.privilege-table-container').on('change', 'input[type="checkbox"]:not(.checkbox-helper)', function () { var checkboxEl = $(this); var wrapperEl = checkboxEl.parent(); var privilege = wrapperEl.attr('data-privilege'); diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl index 99150e05b9..392feddfab 100644 --- a/src/views/admin/partials/privileges/category.tpl +++ b/src/views/admin/partials/privileges/category.tpl @@ -20,6 +20,7 @@ [[admin/manage/categories:privileges.section-group]] + [[admin/manage/privileges:select-clear-all]] {privileges.labels.groups.name} @@ -46,6 +47,7 @@ + {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} @@ -99,6 +101,7 @@ [[admin/manage/categories:privileges.section-user]] + [[admin/manage/privileges:select-clear-all]] {privileges.labels.users.name} @@ -115,6 +118,7 @@ {privileges.users.username} + {function.spawnPrivilegeStates, privileges.users.username, ../privileges} diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl index 2c704ea7b4..ba2106230b 100644 --- a/src/views/admin/partials/privileges/global.tpl +++ b/src/views/admin/partials/privileges/global.tpl @@ -3,7 +3,7 @@ [[admin/manage/categories:privileges.section-group]] - Select/Clear All + [[admin/manage/privileges:select-clear-all]] {privileges.labels.groups.name} @@ -47,7 +47,7 @@ [[admin/manage/categories:privileges.section-user]] - Select/Clear All + [[admin/manage/privileges:select-clear-all]] {privileges.labels.users.name}