From df6f75eb056a8fc1333c2ccf59caeff9d3503034 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Sat, 26 Jan 2019 13:48:18 -0500
Subject: [PATCH] fix: #7298 privilege header misalignment

---
 .../language/en-GB/admin/manage/categories.json  |  1 +
 src/privileges/categories.js                     |  5 ++++-
 .../admin/partials/categories/privileges.tpl     | 16 +++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json
index c14eadea0c23..85aeeb806951 100644
--- a/public/language/en-GB/admin/manage/categories.json
+++ b/public/language/en-GB/admin/manage/categories.json
@@ -35,6 +35,7 @@
 	"privileges.section-viewing": "Viewing Privileges",
 	"privileges.section-posting": "Posting Privileges",
 	"privileges.section-moderation": "Moderation Privileges",
+	"privileges.section-other": "Other",
 	"privileges.section-user": "User",
 	"privileges.search-user": "Add User",
 	"privileges.no-users": "No user-specific privileges in this category.",
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 9e2d580afc80..9eda36d2112f 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -34,7 +34,10 @@ module.exports = function (privileges) {
 			},
 			function (payload, next) {
 				// 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 + 2;
+				payload.columnCountUser = payload.labels.users.length + 2;
+				payload.columnCountUserOther = payload.labels.users.length - privileges.privilegeLabels.length;
+				payload.columnCountGroup = payload.labels.groups.length + 2;
+				payload.columnCountGroupOther = payload.labels.groups.length - privileges.privilegeLabels.length;
 				next(null, payload);
 			},
 		], callback);
diff --git a/src/views/admin/partials/categories/privileges.tpl b/src/views/admin/partials/categories/privileges.tpl
index 4fd009827ffa..9e0b8632d287 100644
--- a/src/views/admin/partials/categories/privileges.tpl
+++ b/src/views/admin/partials/categories/privileges.tpl
@@ -11,6 +11,11 @@
 								<th class="arrowed" colspan="3">
 									[[admin/manage/categories:privileges.section-moderation]]
 								</th>
+								<!-- IF privileges.columnCountUserOther -->
+								<th class="arrowed" colspan="{privileges.columnCountUserOther}">
+									[[admin/manage/categories:privileges.section-other]]
+								</th>
+								<!-- END -->
 							</tr><tr><!-- zebrastripe reset --></tr>
 							<tr>
 								<th colspan="2">[[admin/manage/categories:privileges.section-user]]</th>
@@ -35,7 +40,7 @@
 							</tr>
 							<!-- END privileges.users -->
 							<tr>
-								<td colspan="{privileges.columnCount}">
+								<td colspan="{privileges.columnCountUser}">
 									<button type="button" class="btn btn-primary pull-right" data-ajaxify="false" data-action="search.user">
 										[[admin/manage/categories:privileges.search-user]]
 									</button>
@@ -43,7 +48,7 @@
 							</tr>
 							<!-- ELSE -->
 							<tr>
-								<td colspan="{privileges.columnCount}">
+								<td colspan="{privileges.columnCountUser}">
 									[[admin/manage/categories:privileges.no-users]]
 									<button type="button" class="btn btn-primary pull-right" data-ajaxify="false" data-action="search.user">
 										[[admin/manage/categories:privileges.search-user]]
@@ -67,6 +72,11 @@
 								<th class="arrowed" colspan="3">
 									[[admin/manage/categories:privileges.section-moderation]]
 								</th>
+								<!-- IF privileges.columnCountGroupOther -->
+								<th class="arrowed" colspan="{privileges.columnCountGroupOther}">
+									[[admin/manage/categories:privileges.section-other]]
+								</th>
+								<!-- END -->
 							</tr><tr><!-- zebrastripe reset --></tr>
 							<tr>
 								<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th>
@@ -89,7 +99,7 @@
 							</tr>
 							<!-- END privileges.groups -->
 							<tr>
-								<td colspan="{privileges.columnCount}">
+								<td colspan="{privileges.columnCountGroup}">
 									<div class="btn-toolbar">
 										<button type="button" class="btn btn-primary pull-right" data-ajaxify="false" data-action="search.group">
 											[[admin/manage/categories:privileges.search-group]]