From a5593d66ea541dfbcd2597f81dcbc51965c51cfc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 11 Jul 2018 23:38:14 +0200 Subject: Manage alerts --- ishtar_common/templates/blocks/DataTables.html | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'ishtar_common/templates/blocks/DataTables.html') diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index 0ae6ba7d0..c3ca16395 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -99,8 +99,9 @@ $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) { var query_vars = new Array({{col_idx|safe}}); var selItems_{{sname}} = new Array(); -jQuery(document).ready(function(){ - jQuery("#search_{{name}}").click(function (){ + + +datatable_submit_search = function(){ $("#id_search_vector").removeClass('input-progress'); if ($('.modal-progress').length > 0){ $('.modal-progress').modal('show'); @@ -137,11 +138,22 @@ jQuery(document).ready(function(){ $('.modal-progress').modal('hide'); } return false; - }); +}; + + + +jQuery(document).ready(function(){ + jQuery("#search_{{name}}").click(datatable_submit_search); + + var base_source = "{{source}}"; + + if (default_search_vector){ + base_source += "?search_vector=" + default_search_vector; + } datatable_options = { "ajax": { - "url": "{{source}}", + "url": base_source, "dataSrc": function (json) { manage_pinned_search("{{name}}", json); return json.rows; -- cgit v1.2.3