revamping categories management page in ACP, #2463

NodeBB · Dec 29, 2014 · 42e6c93 · 42e6c93
1 parent e0edb71
commit 42e6c93
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 283 deletions.
diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
@@ -2,7 +2,6 @@
 @import "./mixins";
 
 @import "./general/dashboard";
-@import "./manage/categories";
 @import "./manage/groups";
 @import "./manage/tags";
 @import "./manage/flags";

diff --git a/public/less/admin/manage/categories.less b/public/less/admin/manage/categories.less
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
@@ -40,10 +40,6 @@ define('admin/manage/categories', [
 			return false;
 		}
 
-		function update_blockclass(el) {
-			el.parentNode.parentNode.className = 'entry-row ' + el.value;
-		}
-
 		function updateCategoryOrders() {
 			var categories = $('.admin-categories #entry-container').children();
 			for(var i = 0; i<categories.length; ++i) {

diff --git a/src/controllers/admin.js b/src/controllers/admin.js
@@ -118,33 +118,26 @@ function getStatsForSet(set, field, callback) {
 	}, callback);
 }
 
-adminController.categories.active = function(req, res, next) {
-	filterAndRenderCategories(req, res, next, true);
-};
-
-adminController.categories.disabled = function(req, res, next) {
-	filterAndRenderCategories(req, res, next, false);
-};
+adminController.categories.get = function(req, res, next) {
+	var uid = req.user ? parseInt(req.user.uid, 10) : 0,
+		active = [],
+		disabled = [];
 
-function filterAndRenderCategories(req, res, next, active) {
-	var uid = req.user ? parseInt(req.user.uid, 10) : 0;
 	categories.getAllCategories(uid, function (err, categoryData) {
 		if (err) {
 			return next(err);
 		}
 
-		categoryData = categoryData.filter(function (category) {
-			if (!category) {
-				return false;
-			}
-			return active ? !category.disabled : category.disabled;
+		categoryData.filter(Boolean).forEach(function(category) {
+			(category.disabled ? disabled : active).push(category);
 		});
 
 		res.render('admin/manage/categories', {
-			categories: categoryData
+			active: active,
+			disabled: disabled
 		});
 	});
-}
+};
 
 adminController.tags.get = function(req, res, next) {
 	topics.getTags(0, 199, function(err, tags) {

diff --git a/src/routes/admin.js b/src/routes/admin.js
@@ -44,9 +44,7 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/general/languages', controllers.admin.languages.get);
 	router.get('/general/sounds', controllers.admin.sounds.get);
 
-	router.get('/manage/categories', controllers.admin.categories.active);
-	router.get('/manage/categories/active', controllers.admin.categories.active);
-	router.get('/manage/categories/disabled', controllers.admin.categories.disabled);
+	router.get('/manage/categories', controllers.admin.categories.get);
 
 	router.get('/manage/tags', controllers.admin.tags.get);