summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-07-13 10:30:03 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-07-13 10:30:03 +0200
commita0fdc09ccf429c1473775ff04e1643224d877e20 (patch)
treed70dbab95ccdfcbe4c15f8e4d90315da9fb6182c /ishtar_common
parent939bb82df4a993502d39bfb852b348547746cafa (diff)
downloadIshtar-a0fdc09ccf429c1473775ff04e1643224d877e20.tar.bz2
Ishtar-a0fdc09ccf429c1473775ff04e1643224d877e20.zip
🐛 fix find redirection after geo item creation/modification
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_geographic.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
index eeb618bfe..c48811de0 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
@@ -16,7 +16,9 @@
{% for geo in geo_item.geodata.all %}
<tr>
{% if not IS_HISTORY and permission_change_geo %}<td>
- <a title="{% trans 'Edit' %}" href="{% url 'edit-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}
+ {% autoescape off %}
+ <a title="{% trans 'Edit' %}" href="{% url 'edit-geo' geo.pk %}{% if search_url or find_id %}?{% endif %}{% if find_id %}find_id={{find_id|unlocalize}}&{% endif %}{% if search_url %}back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}
+ {% endautoescape %}
</td>{% endif %}
<td>{% if geo.id == geo_item.main_geodata_id %}<i class="fa fa-check-circle text-success" aria-hidden="true"></i>{% else %}&ndash;{% endif %}</td>
<td>{% if geo.data_type %}{{ geo.data_type }}{% else %}-{% endif %}</td>
@@ -27,9 +29,11 @@
<td>{% if geo.provider %}{{ geo.provider }}{% else %}-{% endif %}</td>
<td>{% if geo.comment %}{{ geo.comment }}{% else %}-{% endif %}</td>
{% if not IS_HISTORY and permission_change_geo and output != "ODT" and output != "PDF" %}<td>
+ {% autoescape off %}
<a title="{% trans 'Delete' %}"
- href="{% url 'delete-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">
+ href="{% url 'delete-geo' geo.pk %}{% if search_url or find_id %}?{% endif %}{% if find_id %}find_id={{find_id|unlocalize}}&{% endif %}{% if search_url %}back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">
{% if geo|can_edit_item:request %}<i class="fa fa-trash text-danger"></i></a>{% else %}&ndash;{% endif %}
+ {% endautoescape %}
</td>{% endif %}
</tr>
{% endfor %}