Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 00:45:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	src/search.js
This commit is contained in:
Baris Usakli
2017-07-28 14:19:09 -04:00
parent 61deb962e3 e0862be3c8
commit 875672522e
36 changed files with 270 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/search.js
View File

@@ -97,6 +97,7 @@ function searchInContent(data, callback) {
function (_metadata, next) {
metadata = _metadata;
matchCount = metadata.pids.length;
if (data.page) {
var start = Math.max(0, (data.page - 1)) * 10;
metadata.pids = metadata.pids.slice(start, start + 10);
@@ -105,7 +106,7 @@ function searchInContent(data, callback) {
posts.getPostSummaryByPids(metadata.pids, data.uid, {}, next);
},
function (posts, next) {
// Append metadata from plugin hooks to returned payload (without pids)
// Append metadata to returned payload (without pids)
delete metadata.pids;
next(null, Object.assign({ posts: posts, matchCount: matchCount, pageCount: Math.max(1, Math.ceil(parseInt(matchCount, 10) / 10)) }, metadata));
},