Merge pull request #1820 from cvisionai/dev/fix_1819_delete_modified_by

Fix #1819, Resolve modified_by on delete calls
cvisionai · Sep 18, 2024 · 87c5ff5 · 87c5ff5
2 parents c06c62a + c2f719d
commit 87c5ff5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/api/main/rest/localization.py b/api/main/rest/localization.py
@@ -261,14 +261,15 @@ def _delete(self, params):
                         qs,
                         params["project"],
                         self.request.user,
-                        update_kwargs={"variant_deleted": True},
+                        update_kwargs={"modified_by": self.request.user, "variant_deleted": True},
                         new_attributes=None,
                     )
                 else:
                     objs = []
                     for original in qs.iterator():
                         original.pk = None
                         original.id = None
+                        original.modified_by = self.request.user
                         original.variant_deleted = True
                         objs.append(original)
                     Localization.objects.bulk_create(objs)
@@ -543,6 +544,7 @@ def delete_qs(self, params, qs):
             b = qs[0]
             b.pk = None
             b.variant_deleted = True
+            b.modified_by = self.request.user
             b.save()
             obj_id = b.id
             log_changes(b, b.model_dict, b.project, self.request.user)

diff --git a/api/main/rest/state.py b/api/main/rest/state.py
@@ -374,7 +374,7 @@ def _delete(self, params):
                         qs,
                         params["project"],
                         self.request.user,
-                        update_kwargs={"variant_deleted": True},
+                        update_kwargs={"variant_deleted": True, "modifed_by": self.request.user},
                         new_attributes=None,
                     )
                 else:
@@ -383,6 +383,7 @@ def _delete(self, params):
                         original.pk = None
                         original.id = None
                         original.variant_deleted = True
+                        original.modified_by = self.request.user
                         objs.append(original)
                     State.objects.bulk_create(objs)
 
@@ -630,6 +631,7 @@ def patch_qs(self, params, qs):
             obj.id = None
             obj.pk = None
             origin_datetime = obj.created_datetime
+            obj.modified_by = self.request.user
             obj.save()
             found_it = State.objects.get(pk=obj.pk)
             # Keep original creation time