projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b59141d
)
Support sorting in autosearches.
author
Mike Taylor
<mike@indexdata.com>
Fri, 6 Dec 2013 17:23:33 +0000
(17:23 +0000)
committer
Mike Taylor
<mike@indexdata.com>
Fri, 6 Dec 2013 17:23:33 +0000
(17:23 +0000)
Fixes bug MKWS-73
tools/htdocs/mkws.js
patch
|
blob
|
history
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
9ffe3e1
..
35b51b7
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-417,7
+417,7
@@
function onFormSubmitEventHandler()
return false;
}
return false;
}
-function newSearch(query)
+function newSearch(query, sort)
{
if (!mkws.authenticated) {
alert("searching before authentication");
{
if (!mkws.authenticated) {
alert("searching before authentication");
@@
-428,7
+428,7
@@
function newSearch(query)
redraw_navi();
resetPage();
loadSelect();
redraw_navi();
resetPage();
loadSelect();
- triggerSearch(query);
+ triggerSearch(query, sort);
mkws.switchView('records'); // In case it's configured to start off as hidden
submitted = true;
}
mkws.switchView('records'); // In case it's configured to start off as hidden
submitted = true;
}
@@
-448,15
+448,18
@@
function resetPage()
totalRec = 0;
}
totalRec = 0;
}
-function triggerSearch (query)
+function triggerSearch (query, sort)
{
var pp2filter = "";
var pp2limit = "";
{
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 (query) {
mkws.query = query;
}
+ if (sort) {
+ mkws.sort = sort;
+ }
for (var i in mkws.filters) {
var filter = mkws.filters[i];
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 + "'");
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);
}
}
}
}