X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=35b51b714a50af2cbcd402e0deac8129020f6c2e;hb=8c38df632cb19448f3b4d334ad915f24506f0523;hp=9ffe3e1e448adab75aedf866cf3309a7796ef426;hpb=b59141d690e60a7817dabfa5185524a2d2f3c512;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 9ffe3e1..35b51b7 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -417,7 +417,7 @@ function onFormSubmitEventHandler() return false; } -function newSearch(query) +function newSearch(query, sort) { if (!mkws.authenticated) { alert("searching before authentication"); @@ -428,7 +428,7 @@ function newSearch(query) redraw_navi(); resetPage(); loadSelect(); - triggerSearch(query); + triggerSearch(query, sort); mkws.switchView('records'); // In case it's configured to start off as hidden submitted = true; } @@ -448,15 +448,18 @@ function resetPage() totalRec = 0; } -function triggerSearch (query) +function triggerSearch (query, sort) { var pp2filter = ""; var pp2limit = ""; - // Re-use previous query if a new one is not specified + // Re-use previous query/sort if new ones are not specified if (query) { mkws.query = query; } + if (sort) { + mkws.sort = sort; + } for (var i in mkws.filters) { var filter = mkws.filters[i]; @@ -921,8 +924,7 @@ function run_auto_searches() { var query = node.attr('autosearch'); var sort = node.attr('sort'); debug("running auto search: '" + query + "' sorted by '" + sort + "'"); - // ### currently ignoring sort - newSearch(query); + newSearch(query, sort); } }