Add documents to administrative acts (refs #4999)

3 files changed, 16 insertions, 11 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ac3755e13..e841690bb 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2714,19 +2714,21 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
     # other will be symbolic links
     RELATED_MODELS = [
         'treatment_files', 'treatments', 'finds', 'context_records',
-        'operations', 'sites', 'warehouses', 'containers', 'files'
+        'operations', 'sites', 'warehouses', 'containers', 'files',
+        'administrativeacts',
     ]
     # same fields but in order for forms
     RELATED_MODELS_ALT = [
         'finds', 'context_records', 'operations', 'sites', 'files',
-        'warehouses', 'containers', 'treatments', 'treatment_files',
+        'administrativeacts', 'warehouses', 'containers', 'treatments',
+        'treatment_files',
     ]
     SLUG = 'document'
     LINK_SPLIT = "<||>"
 
     GET_VALUES_EXCLUDE_FIELDS = ValueGetter.GET_VALUES_EXCLUDE_FIELDS + [
         "warehouses", "operations", "treatments",
-        "files", "treatment_files", "id",
+        "files", "treatment_files", "administrativeacts", "id",
         "associated_links", "source_type_id",
         "history_creator_id", "containers", "sites",
         "main_image_warehouses", "main_image_operations",
@@ -2977,6 +2979,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
         ('warehouse', 'warehouses__pk'),
         ('treatment', 'treatments__pk'),
         ('treatmentfile', 'treatment_files__pk'),
+        ('administrativeact', 'administrativeacts__pk'),
     ]
 
     UP_MODEL_QUERY = {
@@ -3239,10 +3242,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
 
     def public_representation(self):
         site = Site.objects.get_current()
-        if settings.ISHTAR_SECURE:
-            scheme = "https"
-        else:
-            scheme = "http"
+        scheme = "https" if settings.ISHTAR_SECURE else "http"
         base_url = scheme + "://" + site.domain + "/"
         image = None
         if self.image:
@@ -3334,10 +3334,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
 
     @property
     def has_related(self):
-        for rel in self.RELATED_MODELS:
-            if getattr(self, rel).count():
-                return True
-        return False
+        return any(getattr(self, rel).count() for rel in self.RELATED_MODELS)
 
     @classmethod
     def get_query_owns(cls, ishtaruser):
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 28026536a..17ba88419 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -2328,6 +2328,13 @@ class DocumentItem:
             image__isnull=False).exclude(
             image="").exclude(pk=self.main_image.pk).order_by("pk")
 
+    @property
+    def pdf_attached(self):
+        for document in self.documents.filter(
+                Q(associated_file__isnull=False) |
+                Q(source__associated_file__isnull=False)).all():
+            return document.pdf_attached
+
     def get_extra_actions(self, request):
         """
         For sheet template: return "Add document / image" action
diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html
index 08af1e928..5e74abe1c 100644
--- a/ishtar_common/templates/ishtar/sheet_document.html
+++ b/ishtar_common/templates/ishtar/sheet_document.html
@@ -118,6 +118,7 @@
 {% if item.has_related %}
 <h3>{% trans "Related items" %}</h3>
 {% field_flex_full "Files" item.files|add_links %}
+{% field_flex_full "Administrative acts" item.administrativeacts|add_links %}
 {% field_flex_full "Sites" item.sites|add_links %}
 {% field_flex_full "Operations" item.operations|add_links %}
 {% field_flex_full "Context records" item.context_records|add_links %}