fix: show disabled categories in admin&mods

NodeBB · Oct 5, 2020 · 2ea9768 · 2ea9768
1 parent d93315e
commit 2ea9768
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/controllers/admin/admins-mods.js b/src/controllers/admin/admins-mods.js
@@ -13,7 +13,7 @@ AdminsMods.get = async function (req, res) {
 	const [admins, globalMods, categories] = await Promise.all([
 		groups.get('administrators', { uid: req.uid }),
 		groups.get('Global Moderators', { uid: req.uid }),
-		getModeratorsOfCategories(req.uid),
+		getModeratorsOfCategories(),
 	]);
 
 	res.render('admin/manage/admins-mods', {
@@ -24,8 +24,8 @@ AdminsMods.get = async function (req, res) {
 	});
 };
 
-async function getModeratorsOfCategories(uid) {
-	const categoryData = await categories.buildForSelect(uid, 'find', ['depth']);
+async function getModeratorsOfCategories() {
+	const categoryData = await categories.buildForSelectAll(['depth', 'disabled']);
 	const moderatorUids = await categories.getModeratorUids(categoryData.map(c => c.cid));
 	const uids = _.uniq(_.flatten(moderatorUids));
 	const moderatorData = await user.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture']);

diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
@@ -40,7 +40,7 @@
 
 	<!-- BEGIN categories -->
 	<div class="categories category-wrapper category-depth-{categories.depth}">
-	<h4><!-- IF categories.icon --><i class="fa {categories.icon}"></i> <!-- ENDIF categories.icon -->[[admin/manage/admins-mods:moderators-of-category, {categories.name}]]</h4>
+	<h4><!-- IF categories.icon --><i class="fa {categories.icon}"></i> <!-- ENDIF categories.icon -->[[admin/manage/admins-mods:moderators-of-category, {categories.name}]]{{{if categories.disabled}}}<span class="badge badge-primary">[[admin/manage/admins-mods:disabled]]</span>{{{end}}}</h4>
 	<div class="moderator-area" data-cid="{categories.cid}">
 		<!-- BEGIN categories.moderators -->
 			<div class="user-card pull-left" data-uid="{categories.moderators.uid}">