From e9b2fabf834bf452bcb458f6a3ba8fa04131bc7d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Mar 2022 13:36:50 -0400
Subject: [PATCH] fix: column counts for other privileges

---
 src/privileges/global.js                       | 6 ++++--
 src/views/admin/partials/privileges/global.tpl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/privileges/global.js b/src/privileges/global.js
index 65d8671c68..472448d4c4 100644
--- a/src/privileges/global.js
+++ b/src/privileges/global.js
@@ -46,6 +46,7 @@ privsGlobal.getPrivilegeList = async () => {
 };
 
 privsGlobal.init = async () => {
+	privsGlobal._coreSize = _privilegeMap.size;
 	await plugins.hooks.fire('static:privileges.global.init', {
 		privileges: _privilegeMap,
 	});
@@ -72,8 +73,9 @@ privsGlobal.list = async function () {
 	});
 	payload.keys = keys;
 
-	// This is a hack because I can't do {labels.users.length} to echo the count in templates.js
-	payload.columnCount = payload.labels.users.length + 3;
+	payload.columnCountUserOther = keys.users.length - privsGlobal._coreSize;
+	payload.columnCountGroupOther = keys.groups.length - privsGlobal._coreSize;
+
 	return payload;
 };
 
diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl
index 8dc3aafc69..db656ccf18 100644
--- a/src/views/admin/partials/privileges/global.tpl
+++ b/src/views/admin/partials/privileges/global.tpl
@@ -66,7 +66,7 @@
 							{{{ if !isAdminPriv }}}
 							<tr class="privilege-table-header">
 								<th class="privilege-filters btn-toolbar" colspan="100">
-									<!-- IF privileges.columnCountGroupOther -->
+									<!-- IF privileges.columnCountUserOther -->
 									<button type="button" data-filter="19,99" class="btn btn-default pull-right">[[admin/manage/categories:privileges.section-other]]</button>
 									<!-- END -->
 									<button type="button" data-filter="16,18" class="btn btn-default pull-right">[[admin/manage/categories:privileges.section-moderation]]</button>