From 025709499c60150991ccdd3060d7f2f1ff6d4559 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 20 Dec 2017 15:19:22 -0500
Subject: [PATCH] more fixes

---
 public/src/admin/manage/category.js   | 1 -
 public/src/admin/manage/privileges.js | 4 ++--
 src/controllers/admin/categories.js   | 1 -
 src/controllers/admin/privileges.js   | 3 +--
 src/install.js                        | 6 ++++++
 src/privileges/global.js              | 4 ----
 src/privileges/helpers.js             | 2 +-
 src/upgrades/1.8.0/chat_privilege.js  | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 71470baf46..fb4ae062b8 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -18,7 +18,6 @@ define('admin/manage/category', [
 		});
 
 		$('#category-selector').on('change', function () {
-			var val = $(this).val();
 			ajaxify.go('admin/manage/categories/' + $(this).val() + window.location.hash);
 		});
 
diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js
index 98587fc87f..74aea3a195 100644
--- a/public/src/admin/manage/privileges.js
+++ b/public/src/admin/manage/privileges.js
@@ -4,7 +4,7 @@ define('admin/manage/privileges', [
 	'autocomplete',
 	'translator',
 	'benchpress',
-	'categorySelector'
+	'categorySelector',
 ], function (autocomplete, translator, Benchpress, categorySelector) {
 	var	Privileges = {};
 
@@ -62,7 +62,7 @@ define('admin/manage/privileges', [
 			if (err) {
 				return app.alertError(err.message);
 			}
-			var tpl = cid ? 'admin/partials/categories/privileges' : 'admin/manage/privileges';
+			var tpl = cid ? 'admin/partials/categories/privileges' : 'admin/partials/global/privileges';
 			Benchpress.parse(tpl, {
 				privileges: privileges,
 			}, function (html) {
diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js
index b3564afcef..e03b51745c 100644
--- a/src/controllers/admin/categories.js
+++ b/src/controllers/admin/categories.js
@@ -3,7 +3,6 @@
 var async = require('async');
 
 var categories = require('../../categories');
-var privileges = require('../../privileges');
 var analytics = require('../../analytics');
 var plugins = require('../../plugins');
 var translator = require('../../translator');
diff --git a/src/controllers/admin/privileges.js b/src/controllers/admin/privileges.js
index 1fad4cfd06..92dbe27ef9 100644
--- a/src/controllers/admin/privileges.js
+++ b/src/controllers/admin/privileges.js
@@ -13,7 +13,7 @@ privilegesController.get = function (req, res, callback) {
 		function (next) {
 			async.parallel({
 				privileges: function (next) {
-					if (!cid)  {
+					if (!cid) {
 						privileges.global.list(next);
 					} else {
 						privileges.categories.list(cid, next);
@@ -23,7 +23,6 @@ privilegesController.get = function (req, res, callback) {
 			}, next);
 		},
 		function (data) {
-
 			data.allCategories.forEach(function (category) {
 				if (category) {
 					category.selected = parseInt(category.cid, 10) === parseInt(cid, 10);
diff --git a/src/install.js b/src/install.js
index b55b1ed08e..e9e8eecb49 100644
--- a/src/install.js
+++ b/src/install.js
@@ -353,6 +353,11 @@ function createGlobalModeratorsGroup(next) {
 	], next);
 }
 
+function giveGlobalPrivileges(next) {
+	var groups = require('./groups');
+	groups.join('cid:0:privileges:groups:chat', 'registered-users', next);
+}
+
 function createCategories(next) {
 	var Categories = require('./categories');
 
@@ -498,6 +503,7 @@ install.setup = function (callback) {
 		createCategories,
 		createAdministrator,
 		createGlobalModeratorsGroup,
+		giveGlobalPrivileges,
 		createMenuItems,
 		createWelcomePost,
 		enableDefaultPlugins,
diff --git a/src/privileges/global.js b/src/privileges/global.js
index 0ca4ac4347..bf86029ac0 100644
--- a/src/privileges/global.js
+++ b/src/privileges/global.js
@@ -2,10 +2,8 @@
 'use strict';
 
 var async = require('async');
-var _ = require('lodash');
 
 var user = require('../user');
-var groups = require('../groups');
 var helpers = require('./helpers');
 var plugins = require('../plugins');
 
@@ -65,6 +63,4 @@ module.exports = function (privileges) {
 			},
 		], callback);
 	};
-
-
 };
diff --git a/src/privileges/helpers.js b/src/privileges/helpers.js
index 8f2f21f0f7..5a1218ae19 100644
--- a/src/privileges/helpers.js
+++ b/src/privileges/helpers.js
@@ -220,4 +220,4 @@ helpers.getGroupPrivileges = function (cid, hookName, groupPrivilegeList, callba
 			}, next);
 		},
 	], callback);
-};
\ No newline at end of file
+};
diff --git a/src/upgrades/1.8.0/chat_privilege.js b/src/upgrades/1.8.0/chat_privilege.js
index d337784d2b..c4bd2ff8d1 100644
--- a/src/upgrades/1.8.0/chat_privilege.js
+++ b/src/upgrades/1.8.0/chat_privilege.js
@@ -7,6 +7,6 @@ module.exports = {
 	name: 'Give chat privilege to registered-users',
 	timestamp: Date.UTC(2017, 11, 18),
 	method: function (callback) {
-		groups.join('cid:0:privileges:group:chat', 'registered-users', callback);
+		groups.join('cid:0:privileges:groups:chat', 'registered-users', callback);
 	},
 };