summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-11-17 19:07:14 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-11-17 19:07:14 +0100
commitf6ac3408e5c80eed187262e665741eb0238393c5 (patch)
tree94ea028c2d02cf151af09cc0166a48073f00846d
parent394f3f7f5e649a2fbc762b3f2d4c38154942c61d (diff)
downloadIshtar-f6ac3408e5c80eed187262e665741eb0238393c5.tar.bz2
Ishtar-f6ac3408e5c80eed187262e665741eb0238393c5.zip
CSV export is associated to current search (and no more give the whole export)
-rw-r--r--ishtar_common/templates/blocks/JQueryJqGrid.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 6f8c94cbb..d7247e7f3 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -15,10 +15,10 @@
<div id='foot_{{name}}' class='gridfooter'>
{% if source_full %}
{% trans "Export as CSV" %} ({{encoding}})
-<a href='{{source}}csv' target='_blank'>{% trans "simple" %}</a> -
-<a href='{{source_full}}csv' target='_blank'>{% trans "full" %}</a>
+<a class='{{sname}}-csv' href='{{source}}csv' target='_blank'>{% trans "simple" %}</a> -
+<a class='{{sname}}-csv-full' href='{{source_full}}csv' target='_blank'>{% trans "full" %}</a>
{% else %}
-<a href="{{source}}csv" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
+<a class='{{sname}}-csv' href="{{source}}csv" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
{% endif %}
</div>
@@ -50,6 +50,11 @@ jQuery(document).ready(function(){
}
var mygrid = jQuery("#grid_{{name}}");
var url = "{{source}}?submited=1&" + data;
+ var csv_url = "{{source}}csv?submited=1&" + data;
+ $(".{{sname}}-csv").attr("href", csv_url);
+ var csv_full_url = "{{source_full}}csv?submited=1&" + data;
+ $(".{{sname}}-csv-full").attr("href", csv_full_url);
+
mygrid.setGridParam({url:url});
mygrid.trigger("reloadGrid");
if ($("#progress").length > 0){