Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

action:category.loaded, sort qs on category page

Browse Source
This commit is contained in:
barisusakli
2016-07-21 23:53:43 +03:00
parent ecafd87e91
commit 58ab76d3c2
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/topics.js
View File

@@ -19,7 +19,6 @@ var topicsController = {};
topicsController.get = function(req, res, callback) {
var tid = req.params.topic_id;
var sort = req.query.sort;
var currentPage = parseInt(req.query.page, 10) || 1;
var pageCount = 1;
var userPrivileges;
@@ -76,18 +75,13 @@ topicsController.get = function(req, res, callback) {
var set = 'tid:' + tid + ':posts';
var reverse = false;
// `sort` qs has priority over user setting
var sort = req.query.sort || settings.topicPostSort;
if (sort === 'newest_to_oldest') {
reverse = true;
} else if (sort === 'most_votes') {
reverse = true;
set = 'tid:' + tid + ':posts:votes';
} else if (settings.topicPostSort === 'newest_to_oldest') {
reverse = true;
} else if (settings.topicPostSort === 'most_votes') {
reverse = true;
set = 'tid:' + tid + ':posts:votes';
}
var postIndex = 0;
@@ -270,7 +264,7 @@ topicsController.get = function(req, res, callback) {
data.postDeleteDuration = parseInt(meta.config.postDeleteDuration, 10) || 0;
data.scrollToMyPost = settings.scrollToMyPost;
data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
data.pagination = pagination.create(currentPage, pageCount);
data.pagination = pagination.create(currentPage, pageCount, req.query);
data.pagination.rel.forEach(function(rel) {
rel.href = nconf.get('url') + '/topic/' + data.slug + rel.href;
res.locals.linkTags.push(rel);