From 87d74abfc9b4d2f798f0579bc076970495c6b496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 16:19:02 +0300 Subject: [PATCH 1/9] Add parameters for create categories --- src/categories/create.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/categories/create.js b/src/categories/create.js index a8bfaeb6fc..5838ea1dc3 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -19,19 +19,19 @@ module.exports = function(Categories) { var category = { cid: cid, name: data.name, - description: data.description, - icon: data.icon, - bgColor: data.bgColor, - color: data.color, + description: ( data.description ? data.description : '' ), + icon: ( data.icon ? data.icon : '' ), + bgColor: ( data.bgColor ? data.bgColor : '' ), + color: ( data.color ? data.color : '' ), slug: slug, - parentCid: 0, + parentCid: ( data.parentCid ? data.parentCid : 0 ), topic_count: 0, post_count: 0, disabled: 0, - order: order, + order: ( data.order ? data.order : cid ), link: '', numRecentReplies: 1, - class: 'col-md-3 col-xs-6', + class: ( data.class ? data.class : 'col-md-3 col-xs-6' ), imageClass: 'auto' }; From 3910f8bf28e6b2cab196edb50f06b6485e7ec3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 16:43:02 +0300 Subject: [PATCH 2/9] Add parameters for create categories --- src/categories/create.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/categories/create.js b/src/categories/create.js index a8bfaeb6fc..6d5147f97e 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -19,19 +19,19 @@ module.exports = function(Categories) { var category = { cid: cid, name: data.name, - description: data.description, - icon: data.icon, - bgColor: data.bgColor, - color: data.color, + description: ( data.description ? data.description : '' ), + icon: ( data.icon ? data.icon : '' ), + bgColor: ( data.bgColor ? data.bgColor : '' ), + color: ( data.color ? data.color : '' ), slug: slug, - parentCid: 0, + parentCid: ( data.parentCid ? data.parentCid : 0 ), topic_count: 0, post_count: 0, disabled: 0, - order: order, + order: ( data.order ? data.order : cid ), link: '', numRecentReplies: 1, - class: 'col-md-3 col-xs-6', + class: ( data.class ? data.class : 'col-md-3 col-xs-6' ), imageClass: 'auto' }; @@ -39,7 +39,7 @@ module.exports = function(Categories) { async.series([ async.apply(db.setObject, 'category:' + cid, category), - async.apply(db.sortedSetAdd, 'categories:cid', order, cid), + async.apply(db.sortedSetAdd, 'categories:cid', data.order, cid), async.apply(privileges.categories.give, defaultPrivileges, cid, 'administrators'), async.apply(privileges.categories.give, defaultPrivileges, cid, 'registered-users'), async.apply(privileges.categories.give, ['find', 'read'], cid, 'guests') From cc384cc4d6799f23c0803af6b8c817ae7e10acbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 16:45:22 +0300 Subject: [PATCH 3/9] Update file for create categories --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index 6d5147f97e..5838ea1dc3 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -39,7 +39,7 @@ module.exports = function(Categories) { async.series([ async.apply(db.setObject, 'category:' + cid, category), - async.apply(db.sortedSetAdd, 'categories:cid', data.order, cid), + async.apply(db.sortedSetAdd, 'categories:cid', order, cid), async.apply(privileges.categories.give, defaultPrivileges, cid, 'administrators'), async.apply(privileges.categories.give, defaultPrivileges, cid, 'registered-users'), async.apply(privileges.categories.give, ['find', 'read'], cid, 'guests') From 8a5b5936b7975b6605b0caa30d217a19b013327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 16:56:57 +0300 Subject: [PATCH 4/9] Revert line bgColor --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index 5838ea1dc3..32b346264d 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -21,7 +21,7 @@ module.exports = function(Categories) { name: data.name, description: ( data.description ? data.description : '' ), icon: ( data.icon ? data.icon : '' ), - bgColor: ( data.bgColor ? data.bgColor : '' ), + bgColor: data.bgColor, color: ( data.color ? data.color : '' ), slug: slug, parentCid: ( data.parentCid ? data.parentCid : 0 ), From 6d03f5c9e81dfd1178bbab764c6cd894e0ad658d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 17:04:30 +0300 Subject: [PATCH 5/9] Revert line order --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index 32b346264d..b522f0750f 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -28,7 +28,7 @@ module.exports = function(Categories) { topic_count: 0, post_count: 0, disabled: 0, - order: ( data.order ? data.order : cid ), + order: order, link: '', numRecentReplies: 1, class: ( data.class ? data.class : 'col-md-3 col-xs-6' ), From 3831cd0e711d2a0d9e3d893c87f834894718c2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 9 Mar 2015 23:19:51 +0300 Subject: [PATCH 6/9] Adding the ability to use a different url --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index b522f0750f..62f9d28266 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -13,7 +13,7 @@ module.exports = function(Categories) { return callback(err); } - var slug = cid + '/' + utils.slugify(data.name), + var slug = data.slug ? cid + '/' + data.slug : cid + '/' + utils.slugify(data.name), order = data.order || cid; // If no order provided, place it at the end var category = { From 621ae9c91ac03d99cd0a0993e19c872c53610fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Wed, 1 Apr 2015 15:11:15 +0300 Subject: [PATCH 7/9] Add admin hooks for get categories --- src/controllers/admin.js | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 24332866f9..48d8b112d2 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -135,11 +135,17 @@ adminController.categories.get = function(req, res, next) { if (err) { return next(err); } - - res.render('admin/manage/category', { - category: data.category[0], - privileges: data.privileges - }); + + plugins.fireHook('filter:admin.categories.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 + }); + }); }); }; @@ -152,14 +158,20 @@ adminController.categories.getAll = function(req, res, next) { if (err) { return next(err); } + + plugins.fireHook('filter:admin.categories.getAll', {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); + }); - categoryData.filter(Boolean).forEach(function(category) { - (category.disabled ? disabled : active).push(category); - }); - - res.render('admin/manage/categories', { - active: active, - disabled: disabled + res.render('admin/manage/categories', { + active: active, + disabled: disabled + }); }); }); }; From 6b3b44e2fc984e13e3049774a9594b6592c365f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Wed, 1 Apr 2015 18:22:55 +0300 Subject: [PATCH 8/9] Delete errors --- src/categories/create.js | 2 +- src/controllers/admin.js | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) 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 + }); }); }); }; From ce743be779d43e7078897d9b27f221c4bde3eb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Wed, 1 Apr 2015 18:25:27 +0300 Subject: [PATCH 9/9] Delete errors --- src/controllers/admin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 91e0a65972..c659c53446 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -158,15 +158,15 @@ adminController.categories.getAll = function(req, res, next) { return next(err); } - plugins.fireHook('filter:admin.categories.get', {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