diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/DataTables.html | 38 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 1 |
3 files changed, 29 insertions, 13 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 910ee92d0..2527c1bd7 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -1348,9 +1348,6 @@ var main_submit_search = function(){ var search_get_query_data = function(query_vars, table_name){ $("#id_search_vector").removeClass('input-progress'); - if ($('.modal-progress').length > 0){ - $('.modal-progress').modal('show'); - } var data = ""; for (idx in query_vars){ var key = query_vars[idx]; diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index 75151615e..90eced2f9 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -134,11 +134,30 @@ map_submit_search = function(){ }; {% endif %} -datatable_submit_search = function(){ +datatable_submit_search = function(not_submited){ var data = search_get_query_data(query_vars, "{{name}}"); var mygrid = jQuery("#grid_{{name}}"); - var url = "{{source}}?submited=1&" + data; - datatable_{{sname}}.ajax.url(url).load(); + var url = ""; + if (!not_submited){ + url = "{{source}}?submited=1&" + data; + } else { + url = "{{source}}?" + data; + } + + datatable_{{sname}}.ajax.url(url); + datatable_{{sname}}.draw(); + + setTimeout( // wait for modal-progress to be loaded on the page + function(){ + $('.modal-progress').modal('show'); + }, 50 + ); + + return false; +}; + +update_submit_args = function(){ + var data = search_get_query_data(query_vars, "{{name}}"); var csv_url = "{{source}}csv?submited=1&" + data; $(".{{sname}}-csv").attr("href", csv_url); var csv_full_url = "{{source_full}}csv?submited=1&" + data; @@ -146,11 +165,6 @@ datatable_submit_search = function(){ {% for slug, name, extra_source in extra_sources %} $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data); {% endfor %} - - if ($('.modal-progress').length > 0){ - $('.modal-progress').modal('hide'); - } - return false; }; @@ -170,9 +184,15 @@ jQuery(document).ready(function(){ "url": base_source, "dataSrc": function (json) { manage_pinned_search("{{name}}", json); + update_submit_args(); + setTimeout( // 50ms is waited on load so... + function(){ + $('.modal-progress').modal('hide'); + }, 50); return json.rows; } }, + "deferLoading": 0, "select": { "style": {% if multiple_select or quick_actions %}'multi'{% else %}'single'{% endif %} }, @@ -287,7 +307,7 @@ jQuery(document).ready(function(){ return true; }); {% endif %} - + datatable_submit_search(true); }); function get_next_table_id(c_id){ diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 31b4f7853..57d778459 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -996,7 +996,6 @@ def _manage_default_search(dct, request, model, default_name, my_base_request, break except up_model.DoesNotExist: pass - return dct, pinned_search |