small refactor of category controller

v1.18.x
Baris Usakli 8 years ago
parent deecf04454
commit 982184740d

@ -27,6 +27,8 @@ categoryController.get = function (req, res, callback) {
return callback(); return callback();
} }
var topicIndex = utils.isNumber(req.params.topic_index) ? parseInt(req.params.topic_index, 10) - 1 : 0;
async.waterfall([ async.waterfall([
function (next) { function (next) {
async.parallel({ async.parallel({
@ -57,7 +59,7 @@ categoryController.get = function (req, res, callback) {
} }
settings = results.userSettings; settings = results.userSettings;
var topicIndex = utils.isNumber(req.params.topic_index) ? parseInt(req.params.topic_index, 10) - 1 : 0;
var topicCount = parseInt(results.categoryData.topic_count, 10); var topicCount = parseInt(results.categoryData.topic_count, 10);
pageCount = Math.max(1, Math.ceil(topicCount / settings.topicsPerPage)); pageCount = Math.max(1, Math.ceil(topicCount / settings.topicsPerPage));
@ -77,30 +79,22 @@ categoryController.get = function (req, res, callback) {
topicIndex = 0; topicIndex = 0;
} }
var sort = req.query.sort || settings.categoryTopicSort; user.getUidByUserslug(req.query.author, next);
},
function (targetUid, next) {
var start = ((currentPage - 1) * settings.topicsPerPage) + topicIndex; var start = ((currentPage - 1) * settings.topicsPerPage) + topicIndex;
var stop = start + settings.topicsPerPage - 1; var stop = start + settings.topicsPerPage - 1;
categories.getCategoryById({
async.waterfall([ uid: req.uid,
function (next) { cid: cid,
user.getUidByUserslug(req.query.author, next); start: start,
}, stop: stop,
function (targetUid, next) { sort: req.query.sort || settings.categoryTopicSort,
var payload = { settings: settings,
uid: req.uid, query: req.query,
cid: cid, tag: req.query.tag,
start: start, targetUid: targetUid,
stop: stop, }, next);
sort: sort,
settings: settings,
query: req.query,
tag: req.query.tag,
targetUid: targetUid,
};
categories.getCategoryById(payload, next);
},
], next);
}, },
function (categoryData, next) { function (categoryData, next) {
categories.modifyTopicsByPrivilege(categoryData.topics, userPrivileges); categories.modifyTopicsByPrivilege(categoryData.topics, userPrivileges);

Loading…
Cancel
Save