Merge branch 'master' of https://github.com/NodeBB/NodeBB

src/controllers/admin/info.js

@@ -79,6 +79,12 @@ async function getNodeInfo() {
 			release: os.release(),
 			load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '),
 		},
+		nodebb: {
+			isCluster: nconf.get('isCluster'),
+			isPrimary: nconf.get('isPrimary'),
+			runJobs: nconf.get('runJobs'),
+			jobsDisabled: nconf.get('jobsDisabled'),
+		},
 	};
 	data.process.cpuUsage.user /= 1000000;
 	data.process.cpuUsage.user = data.process.cpuUsage.user.toFixed(2);
@@ -109,5 +115,5 @@ async function getGitInfo() {
 		getAsync('git rev-parse HEAD'),
 		getAsync('git rev-parse --abbrev-ref HEAD'),
 	]);
-	return { hash: hash, branch: branch };
+	return { hash: hash, hashShort: hash.substr(0, 6), branch: branch };
 }

src/controllers/mods.js

@@ -181,12 +181,17 @@ modsController.postQueue = async function (req, res, next) {
 	const page = parseInt(req.query.page, 10) || 1;
 	const postsPerPage = 20;
 
-	const [ids, isAdminOrGlobalMod, moderatedCids] = await Promise.all([
+	const [ids, isAdminOrGlobalMod, moderatedCids, allCategories] = await Promise.all([
 		db.getSortedSetRange('post:queue', 0, -1),
 		user.isAdminOrGlobalMod(req.uid),
 		user.getModeratedCids(req.uid),
+		categories.buildForSelect(req.uid, 'find', ['disabled', 'link', 'slug']),
 	]);
 
+	allCategories.forEach((c) => {
+		c.disabledClass = !isAdminOrGlobalMod && !moderatedCids.includes(String(c.cid));
+	});
+
 	let postData = await getQueuedPosts(ids);
 	postData = postData.filter(p => p && (isAdminOrGlobalMod || moderatedCids.includes(String(p.category.cid))));
 
@@ -198,6 +203,7 @@ modsController.postQueue = async function (req, res, next) {
 	res.render('admin/manage/post-queue', {
 		title: '[[pages:post-queue]]',
 		posts: postData,
+		allCategories: allCategories,
 		pagination: pagination.create(page, pageCount),
 		breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:post-queue]]' }]),
 	});

src/controllers/unread.js

@@ -49,7 +49,7 @@ unreadController.get = async function (req, res, next) {
 		req.query.page = Math.max(1, Math.min(data.pageCount, page));
 		return helpers.redirect(res, '/unread?' + querystring.stringify(req.query));
 	}
-	data.showSelect = isPrivileged;
+	data.showSelect = true;
 	data.showTopicTools = isPrivileged;
 	data.categories = watchedCategories.categories;
 	data.allCategoriesUrl = 'unread' + helpers.buildQueryString('', filter, '');