From 27bab3330a0360f736abbf1328d212fda8ce036e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 31 Mar 2015 22:59:34 -0400 Subject: [PATCH] pass data to getCategoryTopics, renamed end to stop --- src/categories.js | 13 +++---------- src/controllers/categories.js | 4 ++-- src/routes/feeds.js | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/categories.js b/src/categories.js index 3061ef8425..c57013f47f 100644 --- a/src/categories.js +++ b/src/categories.js @@ -38,14 +38,7 @@ var async = require('async'), async.parallel({ topics: function(next) { - Categories.getCategoryTopics({ - cid: data.cid, - set: data.set, - reverse: data.reverse, - start: data.start, - stop: data.end, - uid: data.uid - }, next); + Categories.getCategoryTopics(data, next); }, pageCount: function(next) { Categories.getPageCount(data.cid, data.uid, next); @@ -65,7 +58,7 @@ var async = require('async'), plugins.fireHook('filter:category.get', {category: category, uid: data.uid}, function(err, data) { callback(err, data ? data.category : null); - }); + }); }); }); }; @@ -120,7 +113,7 @@ var async = require('async'), }, function(cids, next) { Categories.getCategories(cids, uid, next); - } + } ], callback); }; diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 55c0122705..c0f99655c4 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -232,14 +232,14 @@ categoriesController.get = function(req, res, next) { } var start = (page - 1) * settings.topicsPerPage + topicIndex, - end = start + settings.topicsPerPage - 1; + stop = start + settings.topicsPerPage - 1; next(null, { cid: cid, set: set, reverse: reverse, start: start, - end: end, + stop: stop, uid: uid }); }, diff --git a/src/routes/feeds.js b/src/routes/feeds.js index 86d9cbb82d..d58c68326d 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -128,7 +128,7 @@ function generateForCategory(req, res, next) { set: 'cid:' + cid + ':tids', reverse: true, start: 0, - end: 25, + stop: 25, uid: uid }, function (err, categoryData) { if (err) {