diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-13 11:04:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:28 +0200 |
| commit | 80cb1c291580ebbc6972f171f87528983798e2bd (patch) | |
| tree | 721d5212b58a9925fe8517c5485c4629c3992e42 | |
| parent | e5ef3e7170ecae01e5651c54df4e0a5025244c9e (diff) | |
| download | Ishtar-80cb1c291580ebbc6972f171f87528983798e2bd.tar.bz2 Ishtar-80cb1c291580ebbc6972f171f87528983798e2bd.zip | |
Fix bad merge
| -rw-r--r-- | ishtar_common/templates/blocks/DataTables.html | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index f0b3b4d4a..a20a151a9 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -133,50 +133,6 @@ map_submit_search = function(){ return false; }; {% endif %} -{% if use_map %} -map_submit_search = function(){ - var data = search_get_query_data(query_vars, "{{name}}"); - var nb_select = jQuery("#id_{{name}}-length_map").val(); - if (!nb_select) nb_select = 10; - - var url = "{{source}}json-map?length=" + nb_select + "&submited=1&" + data; - $.getJSON(url, function(data) { - var timestamp = Math.floor(Date.now() / 1000); - var map_id = "map-" + timestamp; - var result = render_map(data, "{{name}}", nb_select, map_id); - $("#tab-content-map-{{name}}").html(result["html"]); - $("#id_{{name}}-length_map").change(map_submit_search); - register_map(map_id, result["points"]); - }); - - if ($('.modal-progress').length > 0){ - $('.modal-progress').modal('hide'); - } - return false; -}; -{% endif %} -{% if use_map %} -map_submit_search = function(){ - var data = search_get_query_data(query_vars, "{{name}}"); - var nb_select = jQuery("#id_{{name}}-length_map").val(); - if (!nb_select) nb_select = 10; - - var url = "{{source}}json-map?length=" + nb_select + "&submited=1&" + data; - $.getJSON(url, function(data) { - var timestamp = Math.floor(Date.now() / 1000); - var map_id = "map-" + timestamp; - var result = render_map(data, "{{name}}", nb_select, map_id); - $("#tab-content-map-{{name}}").html(result["html"]); - $("#id_{{name}}-length_map").change(map_submit_search); - register_map(map_id, result["points"]); - }); - - if ($('.modal-progress').length > 0){ - $('.modal-progress').modal('hide'); - } - return false; -}; -{% endif %} datatable_submit_search = function(not_submited){ var data = search_get_query_data(query_vars, "{{name}}"); |