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

4 files changed, 29 insertions, 25 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 60840bcf8..69b9b8477 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -44,6 +44,7 @@ var shortcut_url = '';
 var alert_url = '';
 var datatables_i18n;
 var current_modal;
+var default_search_vector;
 
 var datatables_default = {
     "processing": true,
@@ -620,13 +621,10 @@ function clear_search_field(){
 }
 
 function update_search_field(){
-    var base_query = $("#id_search_vector").val();
-    if (base_query){
-        base_query += " ";
-    } else {
-        base_query += "";
+    var query = $("#id_search_vector").val();
+    if (!query){
+        query = "";
     }
-    var query = "";
     var inputs = $('#wizard-form input').map(
         function(){
             var v = "";
@@ -668,10 +666,9 @@ function update_search_field(){
         }
     );
     document.getElementById('wizard-form').reset();
-    base_query += query
-    $("#id_search_vector").val(base_query);
-    if (base_query){
-        add_message(base_query, 'info', "#advanced-search-info", true, false);
+    $("#id_search_vector").val(query);
+    if (query){
+        add_message(query, 'info', "#advanced-search-info", true, false);
     } else {
         add_message("-", 'info', "#advanced-search-info", true, false);
     }
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();
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 85ef5339a..950fa00fe 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -806,6 +806,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
              field.name + (hasattr(field, 'rel') and field.rel and '__pk'
                            or ''))
             for field in fields])
+
         for associated_model, key in my_associated_models:
             if type(associated_model) in (str, unicode):
                 if associated_model not in globals():
@@ -823,6 +824,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
 
         if "query" in dct:
             request_items = dct["query"]
+            request_items["submited"] = True
         elif request.method == 'POST':
             request_items = request.POST
         else: