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

nested categories on search

Browse Source
This commit is contained in:
barisusakli
2015-09-14 22:15:11 -04:00
parent bb47761f6a
commit b17feb3b6c
2 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
public/src/client/search.js
View File

@@ -80,9 +80,11 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco
$('#posted-by-user').val(params.by);
}
if (params.categories) {
$('#posted-in-categories').val(params.categories);
}
loadCategories(function() {
if (params.categories) {
$('#posted-in-categories').val(params.categories);
}
});
if (params.searchChildren) {
$('#search-children').prop('checked', true);
@@ -112,6 +114,38 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco
}
}
function loadCategories(callback) {
var listEl = $('#posted-in-categories');
socket.emit('categories.getCategoriesByPrivilege', 'read', function(err, categories) {
if (err) {
return app.alertError(err.message);
}
categories = categories.filter(function(category) {
return !category.link && !parseInt(category.parentCid, 10);
});
categories.forEach(function(category) {
recursive(category, listEl, '');
});
listEl.attr('size', listEl.find('option').length);
callback();
});
}
function recursive(category, listEl, level) {
if (category.link) {
return;
}
var bullet = level ? '• ' : '';
$('<option value="' + category.cid + '">' + level + bullet + category.name + '</option>').appendTo(listEl);
category.children.forEach(function(child) {
recursive(child, listEl, '&nbsp;&nbsp;&nbsp;&nbsp;' + level);
});
}
function highlightMatches(searchQuery) {
if (!searchQuery) {
return;

72
src/controllers/search.js
View File

@@ -15,60 +15,46 @@ searchController.search = function(req, res, next) {
return next();
}
var breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]);
req.params.term = validator.escape(req.params.term);
var page = Math.max(1, parseInt(req.query.page, 10)) || 1;
if (req.query.categories && !Array.isArray(req.query.categories)) {
req.query.categories = [req.query.categories];
}
categories.getCategoriesByPrivilege('categories:cid', req.uid, 'read', function(err, categories) {
var data = {
query: req.params.term,
searchIn: req.query.in || 'posts',
postedBy: req.query.by,
categories: req.query.categories,
searchChildren: req.query.searchChildren,
replies: req.query.replies,
repliesFilter: req.query.repliesFilter,
timeRange: req.query.timeRange,
timeFilter: req.query.timeFilter,
sortBy: req.query.sortBy,
sortDirection: req.query.sortDirection,
page: page,
uid: req.uid
};
search.search(data, function(err, results) {
if (err) {
return next(err);
}
categories = categories.filter(function(category) {
return category && !category.link;
});
results.pagination = pagination.create(page, results.pageCount, req.query);
results.showAsPosts = !req.query.showAs || req.query.showAs === 'posts';
results.showAsTopics = req.query.showAs === 'topics';
results.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]);
results.expandSearch = !req.params.term;
req.params.term = validator.escape(req.params.term);
var page = Math.max(1, parseInt(req.query.page, 10)) || 1;
if (req.query.categories && !Array.isArray(req.query.categories)) {
req.query.categories = [req.query.categories];
}
var data = {
query: req.params.term,
searchIn: req.query.in || 'posts',
postedBy: req.query.by,
categories: req.query.categories,
searchChildren: req.query.searchChildren,
replies: req.query.replies,
repliesFilter: req.query.repliesFilter,
timeRange: req.query.timeRange,
timeFilter: req.query.timeFilter,
sortBy: req.query.sortBy,
sortDirection: req.query.sortDirection,
page: page,
uid: req.uid
};
search.search(data, function(err, results) {
plugins.fireHook('filter:search.build', {data: data, results: results}, function(err, data) {
if (err) {
return next(err);
}
results.pagination = pagination.create(page, results.pageCount, req.query);
results.showAsPosts = !req.query.showAs || req.query.showAs === 'posts';
results.showAsTopics = req.query.showAs === 'topics';
results.breadcrumbs = breadcrumbs;
results.categories = categories;
results.expandSearch = !req.params.term;
plugins.fireHook('filter:search.build', {data: data, results: results}, function(err, data) {
if (err) {
return next(err);
}
res.render('search', data.results);
});
res.render('search', data.results);
});
});
};
module.exports = searchController;