1 files changed, 20 insertions, 8 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 6013afc27..9cc9d3df9 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -702,6 +702,17 @@ function clear_search_field(){
     enable_save();
 }
 
+function _clear_search_criteria_fields(query){
+    var datatables_length = $(".dataTables_length select").val();
+    document.getElementById('wizard-form').reset();
+    // some input seems to be not cleared...
+    $('#wizard-form input').each(function(){$(this).val("")});
+    $(".dataTables_length select").val(datatables_length);
+    $('.dataTables_length select option[value="' + datatables_length + '"]'
+        ).prop('selected', true);
+    if(query) $("#id_search_vector").val(query);
+}
+
 function update_search_field(){
     var query = $("#id_search_vector").val();
     if (!query){
@@ -749,10 +760,7 @@ function update_search_field(){
             });
         }
     );
-    document.getElementById('wizard-form').reset();
-    // some input seems to be not cleared...
-    $('#wizard-form input').each(function(){$(this).val("")});
-    $("#id_search_vector").val(query);
+    _clear_search_criteria_fields(query);
     if (query){
         add_message(query, 'secondary', "#advanced-search-info", true, false);
     } else {
@@ -789,7 +797,7 @@ function toggle_window_menu(){
 function register_advanced_search(){
     $(".advanced-search-reset").click(
         function(){
-            document.getElementById('wizard-form').reset();
+            _clear_search_criteria_fields();
         }
     );
     $('#modal-advanced-search input').keypress(function(e) {
@@ -805,9 +813,7 @@ function register_advanced_search(){
     $('#modal-advanced-search').on('hidden.bs.modal', function (e) {
         var base_query = $("#id_search_vector").val();
         // reset all criteria
-        document.getElementById('wizard-form').reset();
-        // restore main input
-        $("#id_search_vector").val(base_query);
+        _clear_search_criteria_fields(base_query);
         $(".search_button").click();
         setTimeout(function(){
             $("#id_search_vector").focus();
@@ -819,11 +825,17 @@ function register_advanced_search(){
 }
 
 
+var _pinned_search_init = false;
+
 function manage_pinned_search(name, data){
     $('#pinned_search_content_' + name).html('');
     for (idx in data){
         if (idx == 'pinned-search' && data[idx] != ''){
            $("#id_search_vector").val(data[idx]);
+           if(!_pinned_search_init){
+               update_search_field();
+               _pinned_search_init = true;
+           }
         }
     }
 }