Support sorting in autosearches.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 1a80b10..35b51b7 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -193,6 +193,9 @@ Handlebars.registerHelper('commaList', function(items, options) {
     }
 }
 
+mkws.sort = mkws_config.sort_default;
+debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
+
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
     debug("Reset query width: " + mkws_config.query_width);
     mkws_config.query_width = 50;
@@ -414,7 +417,7 @@ function onFormSubmitEventHandler()
     return false;
 }
 
-function newSearch(query)
+function newSearch(query, sort)
 {
     if (!mkws.authenticated) {
        alert("searching before authentication");
@@ -425,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;
 }
@@ -445,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];
@@ -918,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);
     }
 }
 
@@ -952,7 +957,7 @@ function mkws_html_switch() {
 }
 
 function mkws_html_sort() {
-    debug("HTML sort");
+    debug("HTML sort, mkws.sort = '" + mkws.sort + "'");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
     for(var i = 0; i < mkws_config.sort_options.length; i++) {
@@ -961,7 +966,7 @@ function mkws_html_sort() {
        var val = opt.length == 1 ? opt[0] : opt[1];
 
        sort_html += '<option value="' + key + '"';
-       if (key == mkws_config.sort_default) {
+       if (mkws.sort == key || mkws.sort == val) {
            sort_html += ' selected="selected"';
        }
        sort_html += '>' + M(val) + '</option>';