summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-11-07 12:16:40 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-11-07 12:16:40 +0100
commitfe8275b4ff08a1e815c9cde6509fa466e148346e (patch)
tree507d25bf86488eb09f52b6e5dba892078744950d
parentbb757f6504a484e8449279675a6f3106f3295162 (diff)
downloadIshtar-fe8275b4ff08a1e815c9cde6509fa466e148346e.tar.bz2
Ishtar-fe8275b4ff08a1e815c9cde6509fa466e148346e.zip
🐛 Statistics: fix image display (refs #5650)
-rw-r--r--changelog/en/changelog_2022-06-15.md6
-rw-r--r--changelog/fr/changelog_2023-01-25.md6
-rw-r--r--ishtar_common/static/js/ishtar.js10
-rw-r--r--ishtar_common/templates/blocks/DataTables.html2
4 files changed, 22 insertions, 2 deletions
diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md
index 8530446fb..69e64a0ce 100644
--- a/changelog/en/changelog_2022-06-15.md
+++ b/changelog/en/changelog_2022-06-15.md
@@ -1,3 +1,9 @@
+v4.0.63 - 2023-xx-xx
+--------------------
+
+### Bug fixes ###
+- Statistics: fix image display (#5650)
+
v4.0.62 - 2023-10-27
--------------------
diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md
index f066e373f..5b69e7c8c 100644
--- a/changelog/fr/changelog_2023-01-25.md
+++ b/changelog/fr/changelog_2023-01-25.md
@@ -1,3 +1,9 @@
+v4.0.63 - 2023-xx-xx
+--------------------
+
+### Corrections de dysfonctionnements ###
+- Statistiques: correction de l'affichage image (#5650)
+
v4.0.62 - 2023-10-27
--------------------
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 206a839fd..1c7474c57 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -1617,10 +1617,11 @@ var register_wizard_form = function(){
}
var registered_stats = false;
+var registered_stats_img = new Array();
var extra_list = new Array();
var sources = new Array();
-var register_stats = function(query_vars, name, source){
+var register_stats = function(query_vars, name){
if (registered_stats) return;
registered_stats = true;
$("#stats-form-" + name + " select").on('change',
@@ -1630,6 +1631,12 @@ var register_stats = function(query_vars, name, source){
}
}
);
+};
+
+var register_stats_img = function(query_vars, name, extra){
+ if (registered_stats_img.includes(extra)) return;
+ registered_stats_img.push(extra);
+ if (extra != "") name += "-" + extra;
$('#chart-img-display-' + name).click(function(){
$('#chart-img-' + name).hide();
$('#img-' + name).html(
@@ -1647,6 +1654,7 @@ var _stats_submit_search = function(query_vars, name, source, extra){
var data = search_get_query_data(query_vars, name);
register_stats(query_vars, name);
+ register_stats_img(query_vars, name, extra);
var url = source + "json-stats?submited=1&" + data;
var modality_1 = $("#stats_modality_1-" + name).val();
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 58180a949..e0836bcd8 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -137,7 +137,7 @@ stats_submit_search = function(){
{% if external_sources %}{% for source_id, source_label, source_url, columns, column_labels, export_urls in external_sources %}
_stats_submit_search(query_vars, "{{name}}", "{{source_url}}", "{{source_id}}");
{% endfor %}{% endif %}
- return _stats_submit_search(query_vars, "{{name}}", "{{source}}");
+ return _stats_submit_search(query_vars, "{{name}}", "{{source}}", "default");
};
datatable_submit_search = function(not_submited){