Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 16:12:15 2016 -0500

    added recording and charts for topic and post counts globally and by cid

commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 15:35:49 2016 -0500

    added labels to charts

commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 13:30:47 2016 -0500

    added per category graphs to ACP management page

commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 12:36:11 2016 -0500

    updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page

commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Feb 24 16:48:55 2016 -0500

    saving per-category analytics, and updated the writeData method to use async for "clarity"
This commit is contained in:
Julian Lam
2016-02-25 16:12:50 -05:00
parent a320ec3efb
commit 088940d4c7
9 changed files with 310 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/admin/categories.js
View File

@@ -4,6 +4,7 @@ var async = require('async'),
categories = require('../../categories'),
privileges = require('../../privileges'),
analytics = require('../../analytics'),
plugins = require('../../plugins');
@@ -12,20 +13,22 @@ var categoriesController = {};
categoriesController.get = function(req, res, next) {
async.parallel({
category: async.apply(categories.getCategories, [req.params.category_id], req.user.uid),
privileges: async.apply(privileges.categories.list, req.params.category_id)
privileges: async.apply(privileges.categories.list, req.params.category_id),
analytics: async.apply(analytics.getCategoryAnalytics, req.params.category_id)
}, function(err, data) {
if (err) {
return next(err);
}
plugins.fireHook('filter:admin.category.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, analytics: data.analytics }, function(err, data) {
if (err) {
return next(err);
}
res.render('admin/manage/category', {
category: data.category,
privileges: data.privileges
privileges: data.privileges,
analytics: data.analytics
});
});
});