summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-04-03 17:30:58 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-04-03 17:30:58 +0200
commit95c2cf33370ac73cfab6963d54d2a5bc8728d7a8 (patch)
treea9d415d60bb689c6af40c4427d40c9ca8177f3ca /ishtar_common/templates/ishtar
parent4f4ea768d9d72b96bcf826c525ed1b066191b11b (diff)
parentc50c0e4e5701b9926fbdad82b4ae54964a9283bb (diff)
downloadIshtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.tar.bz2
Ishtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/ishtar')
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 76172d3ac..7239b64fc 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -7,10 +7,10 @@
<div id='foot_{{name}}' class='gridfooter'>
{% if source_full %}
{% trans "Export as CSV" %} ({{encoding}})
-<a href='{{simple_source}}csv{{ source_attrs }}' target='_blank'>{% trans "simple" %}</a> -
-<a href='{{source_full}}csv{{ source_attrs }}' target='_blank'>{% trans "full" %}</a>
+<a href='{{simple_source}}csv{{ source_attrs|safe }}' target='_blank'>{% trans "simple" %}</a> -
+<a href='{{source_full}}csv{{ source_attrs|safe }}' target='_blank'>{% trans "full" %}</a>
{% else %}
-<a href="{{simple_source}}csv{{ source_attrs }}" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
+<a href="{{simple_source}}csv{{ source_attrs|safe }}" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
{% endif %}
</div>
@@ -19,7 +19,7 @@
setTimeout(
function(){
$("#grid_{{name}}").jqGrid({
- url:'{{source}}',
+ url:'{{source|safe}}',
datatype: "json",
mtype: 'GET',
colNames:['id', '', {{col_names|safe}}],