summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-16 11:06:21 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-16 11:06:21 +0100
commitc8ec348e2eb1ab924b2159e3e4987478aa44d3c5 (patch)
treea18bf76379e6aa20b472c8aafa391ecab5856c87 /ishtar_common/templates
parentda134bb54a9a197ebf37f67f48dc88e15088a25b (diff)
downloadIshtar-c8ec348e2eb1ab924b2159e3e4987478aa44d3c5.tar.bz2
Ishtar-c8ec348e2eb1ab924b2159e3e4987478aa44d3c5.zip
Sheets: fix reload after rollback - fix display of the last history version
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_nav.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 62caff142..30e364ae5 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -6,7 +6,7 @@
{% if previous %}
<button type="button" class="btn btn-secondary"
data-toggle="tooltip" data-placement="bottom"
- title="{{previous}}"
+ title="{{previous|date}} {{previous|time:'H:i'}}"
onclick='load_window("{% url histo_url item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;'>
<i class="fa fa-step-backward"></i>
</button>
@@ -14,14 +14,14 @@
{% if next %}
<button type="button" class="btn btn-secondary"
data-toggle="tooltip" data-placement="bottom"
- onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'
+ onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}", function(){closeAllWindows();load_window("{% url show_url item.pk None %}");});}'
title="{% trans 'Restore this version' %}">
<i class="fa fa-history"></i>
</button>
<button type="button" class="btn btn-secondary"
data-toggle="tooltip" data-placement="bottom"
onclick='load_window("{% url histo_url item.pk next|date:"c" %}");$("#{{window_id}}").hide();return false;'
- title="{{next}}">
+ title="{{next|date}} {{next|time:'H:i'}}">
<i class="fa fa-step-forward"></i>
</button>
{% endif %}