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

closes #5771

Browse Source
This commit is contained in:
Baris Usakli
2017-06-23 15:57:23 -04:00
parent a8e4981d30
commit 1f5b3ba636
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,6 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
Search.init = function () { Search.init = function () {
var searchQuery = $('#results').attr('data-search-query'); var searchQuery = $('#results').attr('data-search-query');
$('#search-input').val(searchQuery);
var searchIn = $('#search-in'); var searchIn = $('#search-in');
searchIn.on('change', function () { searchIn.on('change', function () {
@@ -62,12 +60,13 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
function fillOutForm() { function fillOutForm() {
var params = utils.params(); var params = utils.params();
var searchData = searchModule.getSearchPreferences(); var searchData = searchModule.getSearchPreferences();
var formData = utils.merge(searchData, params); var formData = utils.merge(searchData, params);
if (formData) { if (formData) {
if (params.term) { if (ajaxify.data.term) {
$('#search-input').val(params.term); $('#search-input').val(ajaxify.data.term);
} }
if (formData.in) { if (formData.in) {

4
src/controllers/search.js
View File

@@ -2,6 +2,7 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var validator = require('validator');
var meta = require('../meta'); var meta = require('../meta');
var plugins = require('../plugins'); var plugins = require('../plugins');
@@ -68,7 +69,8 @@ searchController.search = function (req, res, next) {
searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]); searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]);
searchData.expandSearch = !req.query.term; searchData.expandSearch = !req.query.term;
searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || ''; searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';
searchData.search_query = validator.escape(String(req.query.term || ''));
searchData.term = req.query.term;
res.render('search', searchData); res.render('search', searchData);
}); });
}; };

2
src/search.js
View File

@@ -1,7 +1,6 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var validator = require('validator');
var db = require('./database'); var db = require('./database');
var posts = require('./posts'); var posts = require('./posts');
@@ -31,7 +30,6 @@ search.search = function (data, callback) {
} }
}, },
function (result, next) { function (result, next) {
result.search_query = validator.escape(String(data.query || ''));
result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2); result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2);
next(null, result); next(null, result);
}, },