3 files changed, 7 insertions, 3 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 33f124d31..99ad857b3 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -1180,6 +1180,9 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType):
                 if new_pk in initial.keys():
                     continue
                 related.add(related.model.objects.get(pk=new_pk))
+        item = models.Document.objects.get(pk=item.pk)
+        item.skip_history_when_saving = True
+        item.save()  # resave to regen the attached items
         return item
 
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 51d3550e9..f80e50a18 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3346,12 +3346,12 @@ class Document(OwnPerms, ImageModel, FullSearch, Imported):
     # other will be symbolic links
     RELATED_MODELS = [
         'treatment_files', 'treatments', 'finds', 'context_records',
-        'operations', 'sites', 'warehouses',
+        'operations', 'sites', 'warehouses', 'files'
     ]
     # same fields but in order for forms
     RELATED_MODELS_ALT = [
-        'finds', 'context_records', 'operations', 'sites', 'warehouses',
-        'treatments', 'treatment_files',
+        'finds', 'context_records', 'operations', 'sites', 'files',
+        'warehouses', 'treatments', 'treatment_files',
     ]
     SLUG = 'document'
     LINK_SPLIT = u"<||>"
diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html
index 465c02db5..3b178c29e 100644
--- a/ishtar_common/templates/ishtar/sheet_document.html
+++ b/ishtar_common/templates/ishtar/sheet_document.html
@@ -49,6 +49,7 @@
 {% block related %}
 {% if item.has_related %}
 <h2>{% trans "Related items" %}</h2>
+{% field_flex_full "Files" item.files|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 %}