Change criteria search UI to put criteria in the search text (refs #4180)

1 files changed, 15 insertions, 14 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index b5d701528..2f04775c5 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -529,12 +529,12 @@ function get_label_from_input(input){
     if (input.parent().filter('.input-group').length){
         input = input.parent();
     }
-    return "<strong>" + input.prev().html() + "</strong>";
+    return input.parent().attr('data-alt-name');
 }
 
 
-function update_search_resume(){
-    var summary = "";
+function update_search_field(){
+    var query = "";
     var inputs = $('#wizard-form input').map(
         function(){
             var v = "";
@@ -555,8 +555,8 @@ function update_search_resume(){
                 v = $(this).val();
             }
             if (v == "") return;
-            if (summary) summary += " ; ";
-            summary += get_label_from_input(item_for_label) + " " + v;
+            if (query) query += " ";
+            query += get_label_from_input(item_for_label) + '="' + v + '"';
         }
     ).get();
     var selects = $('#wizard-form select').each(
@@ -567,18 +567,20 @@ function update_search_resume(){
                     if(item_for_label.filter('optgroup').length){
                         item_for_label = item_for_label.parent();
                     }
-                    if (summary) summary += " ; ";
-                    summary += get_label_from_input(item_for_label) + " " + $(this).text();
+                    if (query) query += " ";
+                    query += get_label_from_input(item_for_label) + '="' +
+                        $(this).text() + '"';
             });
         }
     );
 
-    if (summary != ""){
-        $('#advanced-search-resume-content').html(summary);
-        $('#advanced-search-resume').show();
-    } else {
-        $('#advanced-search-resume').hide();
+    var value = $("#id_search_vector").val();
+    if (value){
+        value += " ";
     }
+    value += query;
+    document.getElementById('wizard-form').reset();
+    value = $("#id_search_vector").val(value);
 }
 
 var sheet_list = new Array();
@@ -610,10 +612,9 @@ function register_advanced_search(){
     $(".advanced-search-reset").click(
         function(){
             document.getElementById('wizard-form').reset();
-            $('#advanced-search-resume').hide();
         }
     );
-    $(".advanced-search-valid").click(update_search_resume);
+    $(".advanced-search-valid").click(update_search_field);
 }