From 514be394a72d3a08a1a7cb0d588ba4c3b51cb395 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Sun, 22 May 2022 20:31:19 +0200
Subject: Geodata - geo forms: new forms - many adaptations

---
 ishtar_common/templates/blocks/bs_form_snippet.html          | 2 +-
 ishtar_common/templates/ishtar/blocks/sheet_geographic.html  | 2 +-
 ishtar_common/templates/ishtar/forms/base_related_items.html | 7 +++++++
 ishtar_common/templates/ishtar/forms/document.html           | 7 -------
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 ishtar_common/templates/ishtar/forms/base_related_items.html
 delete mode 100644 ishtar_common/templates/ishtar/forms/document.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index 3d84ce3dc..769234949 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -72,7 +72,7 @@
             </div>
             <div class="modal-body body-scroll search-fields">
 {% endif %}
-{% if field.name in form.HEADERS %}
+{% if field.name in form.get_headers %}
 {% if forloop.counter0 %}
 </div>{% endif %}
 
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
index 69cd67fcc..e1a8a1200 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
@@ -14,7 +14,7 @@
 {% for geo in geo_item.geodata.all %}
     <tr>
         {% if permission_change_geo %}
-        <td><a href="#">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}</td>
+        <td><a href="{% url 'edit-geo' geo.pk %}">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}</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>
diff --git a/ishtar_common/templates/ishtar/forms/base_related_items.html b/ishtar_common/templates/ishtar/forms/base_related_items.html
new file mode 100644
index 000000000..fe3df8c74
--- /dev/null
+++ b/ishtar_common/templates/ishtar/forms/base_related_items.html
@@ -0,0 +1,7 @@
+{% extends "ishtar/forms/base_form.html" %}
+{% load i18n %}
+{% block form_head %}
+{% if item_related_label %}<div class="alert alert-info">
+    <strong>{% trans "Related items" %}{% trans ":" %}</strong> {{ item_related_label }}
+</div>{% endif %}
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/forms/document.html b/ishtar_common/templates/ishtar/forms/document.html
deleted file mode 100644
index fe3df8c74..000000000
--- a/ishtar_common/templates/ishtar/forms/document.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "ishtar/forms/base_form.html" %}
-{% load i18n %}
-{% block form_head %}
-{% if item_related_label %}<div class="alert alert-info">
-    <strong>{% trans "Related items" %}{% trans ":" %}</strong> {{ item_related_label }}
-</div>{% endif %}
-{% endblock %}
-- 
cgit v1.2.3