From 41e4287f9ed2a803ff0bd42c51973421350e2ee1 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Sun, 27 Oct 2024 17:58:45 -0700 Subject: [PATCH] Fixes an issue where the filename is not updated if the document is in the trash (but the file is moved) --- src/documents/signals/handlers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 0bf20fd5c..73aee2936 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -348,6 +348,8 @@ def cleanup_document_deletion(sender, instance, **kwargs): f"While deleting document {instance!s}, the file " f"{filename} could not be deleted: {e}", ) + elif filename and not os.path.isfile(filename): + logger.warn(f"Expected {filename} tp exist, but it did not") delete_empty_directories( os.path.dirname(instance.source_path), @@ -461,7 +463,7 @@ def update_filename_and_move_files( shutil.move(old_archive_path, instance.archive_path) # Don't save() here to prevent infinite recursion. - Document.objects.filter(pk=instance.pk).update( + Document.global_objects.filter(pk=instance.pk).update( filename=instance.filename, archive_filename=instance.archive_filename, modified=timezone.now(),