From 57b39d5ba2de742438e98f7a75c872152cbea40d Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Tue, 13 Nov 2018 10:26:50 -0700
Subject: [PATCH] fix(acp): small UI fixes for ACP privileges category selector
 (#6946)

- Add dropdown chevron
- Change translations
- Safety against `category` not an object
---
 public/language/en-GB/admin/manage/categories.json | 3 ++-
 src/controllers/admin/privileges.js                | 6 +++---
 src/views/admin/manage/privileges.tpl              | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json
index af717ec2c9..c14eadea0c 100644
--- a/public/language/en-GB/admin/manage/categories.json
+++ b/public/language/en-GB/admin/manage/categories.json
@@ -29,7 +29,8 @@
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
 
-	"privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.",
+	"privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. Select the domain of effect from the dropdown below.",
+	"privileges.category-selector": "Configuring privileges for ",
 	"privileges.warning": "<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.",
 	"privileges.section-viewing": "Viewing Privileges",
 	"privileges.section-posting": "Posting Privileges",
diff --git a/src/controllers/admin/privileges.js b/src/controllers/admin/privileges.js
index 14d631e864..3cb7ecf077 100644
--- a/src/controllers/admin/privileges.js
+++ b/src/controllers/admin/privileges.js
@@ -39,10 +39,10 @@ privilegesController.get = function (req, res, callback) {
 			data.allCategories.forEach(function (category) {
 				if (category) {
 					category.selected = category.cid === cid;
-				}
 
-				if (category.selected) {
-					data.selected = category;
+					if (category.selected) {
+						data.selected = category;
+					}
 				}
 			});
 
diff --git a/src/views/admin/manage/privileges.tpl b/src/views/admin/manage/privileges.tpl
index 0f52e1676a..586751d400 100644
--- a/src/views/admin/manage/privileges.tpl
+++ b/src/views/admin/manage/privileges.tpl
@@ -6,9 +6,9 @@
 			</p>
 
 			<p class="lead">
-				Currently viewing privileges for
+				[[admin/manage/categories:privileges.category-selector]]
 				<button type="button" id="category-selector" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
-					{selected}
+					{selected} <i class="fa fa-angle-down"></i>
 				</button>
 
 				<ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu mdl-js-ripple-effect" for="category-selector">