diff --git a/src/categories/create.js b/src/categories/create.js index 57fb2875b9..ee752a4802 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -23,7 +23,7 @@ module.exports = function(Categories) { description: ( data.description ? data.description : '' ), icon: ( data.icon ? data.icon : '' ), bgColor: data.bgColor || colours[0], - color: ( data.color ? data.color : '' ), + color: data.color || colours[1], slug: slug, parentCid: ( data.parentCid ? data.parentCid : 0 ), topic_count: 0, diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 29fc0b185d..91e0a65972 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -136,16 +136,16 @@ adminController.categories.get = function(req, res, next) { return next(err); } - plugins.fireHook('filter:admin.categories.get', {req: req, res: res, category: data.category[0], privileges: data.privileges}, function(err, data) { + plugins.fireHook('filter:admin.category.get', {req: req, res: res, category: data.category[0], privileges: data.privileges}, function(err, data) { if (err) { return next(err); } - - res.render('admin/manage/category', { - category: data.category, - privileges: data.privileges - }); - }); + + res.render('admin/manage/category', { + category: data.category, + privileges: data.privileges + }); + }); }); }; @@ -158,19 +158,19 @@ adminController.categories.getAll = function(req, res, next) { return next(err); } - plugins.fireHook('filter:admin.categories.getAll', {req: req, res: res, categories: categoryData}, function(err, data) { + plugins.fireHook('filter:admin.categories.get', {req: req, res: res, categories: categoryData}, function(err, data) { if (err) { return next(err); } - + data.categories.filter(Boolean).forEach(function(category) { - (category.disabled ? disabled : active).push(category); - }); - - res.render('admin/manage/categories', { - active: active, - disabled: disabled - }); + (category.disabled ? disabled : active).push(category); + }); + + res.render('admin/manage/categories', { + active: active, + disabled: disabled + }); }); }); };