Fix bookmark load when item is pined - Fix extra space on criteria input - Fix enter submission for bookmarks

2 files changed, 20 insertions, 15 deletions

diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index c3ca16395..ef407d553 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -148,7 +148,7 @@ jQuery(document).ready(function(){
   var base_source = "{{source}}";
 
   if (default_search_vector){
-    base_source += "?search_vector=" + default_search_vector;
+    base_source += "?search_vector=" + default_search_vector + "&submited=1";
   }
 
   datatable_options = {
diff --git a/ishtar_common/templates/ishtar/forms/search_query.html b/ishtar_common/templates/ishtar/forms/search_query.html
index eb8ba6d53..70cad7d98 100644
--- a/ishtar_common/templates/ishtar/forms/search_query.html
+++ b/ishtar_common/templates/ishtar/forms/search_query.html
@@ -94,22 +94,27 @@ var update_form_display = function(){
     }
 }
 
+var submit_sq_form = function(){
+    $.ajax({
+        type: "POST",
+        url: "{% url 'save-search-query' app_label model %}",
+        data: $("#save-search-form").serialize(),
+        success: function(data){
+            $("#save-search-div").parent().html(data);
+        },
+        dataType: 'html'
+    });
+    return false;
+}
+
 $(document).ready(function(){
     $("#id_query").val($(".search-vector").val());
-    $("#search-save-submit").click(
-        function(){
-            $.ajax({
-                type: "POST",
-                url: "{% url 'save-search-query' app_label model %}",
-                data: $("#save-search-form").serialize(),
-                success: function(data){
-                    $("#save-search-div").parent().html(data);
-                },
-                dataType: 'html'
-            });
-            return false;
-        }
-    );
+    $("#search-save-submit").click(submit_sq_form);
+    $("#save-search-form").submit(function(e){
+        e.preventDefault();
+        submit_sq_form();
+        return false;
+    });
     $("#create-choice").click(update_form_display);
     $("#update-choice").click(update_form_display);
     update_form_display();