Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-27 00:51:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: tests

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-07-08 11:22:36 -04:00
parent 6ed7e937ce
commit 55d7e55867
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/topics.js
View File

@@ -59,7 +59,7 @@ topicsController.get = async function getTopic(req, res, callback) {
} }
if (!res.locals.isAPI && (!req.params.slug || topicData.slug !== `${tid}/${req.params.slug}`) && (topicData.slug && topicData.slug !== `${tid}/`)) { if (!res.locals.isAPI && (!req.params.slug || topicData.slug !== `${tid}/${req.params.slug}`) && (topicData.slug && topicData.slug !== `${tid}/`)) {
return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}?${qs.stringify(req.query)}`, true); return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}${generateQueryString(req.query)}`, true);
} }
if (postIndex === 'unread') { if (postIndex === 'unread') {
@@ -67,7 +67,7 @@ topicsController.get = async function getTopic(req, res, callback) {
} }
if (utils.isNumber(postIndex) && topicData.postcount > 0 && (postIndex < 1 || postIndex > topicData.postcount)) { if (utils.isNumber(postIndex) && topicData.postcount > 0 && (postIndex < 1 || postIndex > topicData.postcount)) {
return helpers.redirect(res, `/topic/${tid}/${req.params.slug}${postIndex > topicData.postcount ? `/${topicData.postcount}` : ''}?${qs.stringify(req.query)}`); return helpers.redirect(res, `/topic/${tid}/${req.params.slug}${postIndex > topicData.postcount ? `/${topicData.postcount}` : ''}${generateQueryString(req.query)}`);
} }
postIndex = Math.max(1, postIndex); postIndex = Math.max(1, postIndex);
const sort = req.query.sort || settings.topicPostSort; const sort = req.query.sort || settings.topicPostSort;
@@ -121,6 +121,11 @@ topicsController.get = async function getTopic(req, res, callback) {
res.render('topic', topicData); res.render('topic', topicData);
}; };
function generateQueryString(query) {
let qString = qs.stringify(query);
return qString.length ? `?${qString}` : '';
}
function calculatePageFromIndex(postIndex, settings) { function calculatePageFromIndex(postIndex, settings) {
return 1 + Math.floor((postIndex - 1) / settings.postsPerPage); return 1 + Math.floor((postIndex - 1) / settings.postsPerPage);
} }