From f6ac3408e5c80eed187262e665741eb0238393c5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Tue, 17 Nov 2015 19:07:14 +0100
Subject: CSV export is associated to current search (and no more give the
 whole export)

---
 ishtar_common/templates/blocks/JQueryJqGrid.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ishtar_common')

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){
-- 
cgit v1.2.3