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

show results as WIP

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-02-09 17:02:47 -05:00
parent be92f07ab9
commit c98720ee4c
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en_GB/search.json
View File

@@ -36,5 +36,6 @@
"save-preferences": "Save preferences", "save-preferences": "Save preferences",
"clear-preferences": "Clear preferences", "clear-preferences": "Clear preferences",
"search-preferences-saved": "Search preferences saved", "search-preferences-saved": "Search preferences saved",
"search-preferences-cleared": "Search preferences cleared" "search-preferences-cleared": "Search preferences cleared",
"show-results-as": "Show results as"
} }

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

@@ -50,7 +50,8 @@ define('forum/search', ['search'], function(searchModule) {
timeFilter: form.find('#post-time-filter').val(), timeFilter: form.find('#post-time-filter').val(),
timeRange: form.find('#post-time-range').val(), timeRange: form.find('#post-time-range').val(),
sortBy: form.find('#post-sort-by').val(), sortBy: form.find('#post-sort-by').val(),
sortDirection: form.find('#post-sort-direction').val() sortDirection: form.find('#post-sort-direction').val(),
showAs: form.find('#show-as-topics').is(':checked') ? 'topics' : 'posts'
}; };
return searchData; return searchData;
} }
@@ -97,6 +98,13 @@ define('forum/search', ['search'], function(searchModule) {
$('#post-sort-by').val(params.sortBy); $('#post-sort-by').val(params.sortBy);
$('#post-sort-direction').val(params.sortDirection); $('#post-sort-direction').val(params.sortDirection);
} }
if (params.showAs) {
var isTopic = params.showAs === 'topics';
var ispost = params.showAs === 'posts';
$('#show-as-topics').prop('checked', isTopic).parent().toggleClass('active', isTopic);
$('#show-as-posts').prop('checked', isPost).parent().toggleClass('active', isPost);
}
} }
} }

4
public/src/modules/search.js
View File

@@ -62,6 +62,10 @@ define('search', ['navigator'], function(nav) {
query.sortBy = data.sortBy; query.sortBy = data.sortBy;
query.sortDirection = data.sortDirection; query.sortDirection = data.sortDirection;
} }
if (data.showAs) {
query.showAs = data.showAs;
}
return decodeURIComponent($.param(query)); return decodeURIComponent($.param(query));
} }

3
src/controllers/search.js
View File

@@ -62,7 +62,8 @@ searchController.search = function(req, res, next) {
var pageCount = Math.max(1, Math.ceil(results.matchCount / 10)); var pageCount = Math.max(1, Math.ceil(results.matchCount / 10));
results.pagination = pagination.create(page, pageCount, req.query); results.pagination = pagination.create(page, pageCount, req.query);
results.showAsPosts = !req.query.showAs || req.query.showAs === 'posts';
results.showAsTopics = req.query.showAs === 'topics';
results.breadcrumbs = breadcrumbs; results.breadcrumbs = breadcrumbs;
results.categories = categories; results.categories = categories;
res.render('search', results); res.render('search', results);