Documents: form - save modifier and creator - fix own permissions - fix own select

1 files changed, 6 insertions, 0 deletions

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index d7c6da1ec..375f68784 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -1272,6 +1272,9 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType):
         main_items_fields = {}
         if "main_items_fields" in kwargs:
             main_items_fields = kwargs.pop("main_items_fields")
+        self.user = None
+        if kwargs.get("user", None):
+            self.user = kwargs.pop("user")
         super(DocumentForm, self).__init__(*args, **kwargs)
         for related_key in models.Document.RELATED_MODELS_ALT:
             model = models.Document._meta.get_field(related_key).related_model
@@ -1327,6 +1330,9 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType):
                     related_item.main_image = item
                     related_item.save()
         item = models.Document.objects.get(pk=item.pk)
+        if self.user:
+            item.history_creator = self.user
+        item.history_modifier = self.user
         item.skip_history_when_saving = True
         item.save()  # resave to regen the attached items
         return item