Adapt forms, wizards, views, urls for new management of documents (refs #4107)

2 files changed, 5 insertions, 7 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_image.html b/ishtar_common/templates/ishtar/blocks/window_image.html
index 751fce377..092d224fe 100644
--- a/ishtar_common/templates/ishtar/blocks/window_image.html
+++ b/ishtar_common/templates/ishtar/blocks/window_image.html
@@ -1,10 +1,9 @@
 {% load i18n %}{% if item.images.count %}
 <div class="lightgallery-captions">
-    {% for associated_image in item.associated_images.all %}
-    {% with image=associated_image.image %}
+    {% for image in item.images.all %}
     <div id="lightgallery-{{window_id}}-caption-{{forloop.counter0}}">
         <span class="close">&times</span>
-        {% if image.name %}<h3>{{image.name}}</h3>{% endif %}
+        {% if image.title %}<h3>{{image.title}}</h3>{% endif %}
         {% if image.description %}<p class="raw-description">
         {{image.description}}
         </p>{% endif %}
@@ -78,17 +77,14 @@
         </div>
         {% endif %}
     </div>
-    {% endwith %}
     {% endfor %}
 </div>
 <div id="lightgallery-{{window_id}}">
-    {% for associated_image in item.associated_images.all %}
-    {% with image=associated_image.image %}
+    {% for image in item.images.all %}
     {% if output != "ODT" %}<a data-sub-html="#lightgallery-{{window_id}}-caption-{{forloop.counter0}}" href="{{image.image.url}}"{% if not forloop.first %}
                class="lightgallery-subimage"{% endif %}>{% endif %}
         <img{% if forloop.first %} class='card-img-top'{% endif %} src="{{BASE_URL}}{{image.thumbnail.url}}">
     {% if output != "ODT" %}</a>{% endif %}
-    {% endwith %}
     {% endfor %}
 </div>
 {% endif%}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index c1fe0504e..a37193572 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -103,6 +103,7 @@
 {% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %}
 {% endif %}
 
+{% comment %}
 {% if item.operation_docs_q.count %}
 {% trans "Documents associated to operations" as operation_docs %}
 {% dynamic_table_document operation_docs 'operation_docs' 'person' item.pk '' output %}
@@ -117,6 +118,7 @@
 {% trans "Documents associated to finds" as finds_docs %}
 {% dynamic_table_document finds_docs 'finds_docs' 'person' item.pk '' output %}
 {% endif %}
+{% endcomment %}
 
 
 {% endblock %}