Skip to content

Commit cc7023d

Browse files
committed
Simplify deletion of folders
1 parent b8390bb commit cc7023d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

filer/admin/folderadmin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,7 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
780780
# delete all explicitly selected files
781781
if DJANGO_VERSION >= (5, 1):
782782
self.log_deletions(request, files_queryset)
783+
# Still need to delete files individually (not only the database entries)
783784
for f in files_queryset:
784785
f.delete()
785786
else:
@@ -797,6 +798,7 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
797798
if DJANGO_VERSION >= (5, 1):
798799
qs = File.objects.filter(folder__in=folder_ids)
799800
self.log_deletions(request, qs)
801+
# Still need to delete files individually (not only the database entries)
800802
for f in qs:
801803
f.delete()
802804
else:
@@ -806,8 +808,7 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
806808
# delete all folders
807809
if DJANGO_VERSION >= (5, 1):
808810
self.log_deletions(request, files_queryset)
809-
for f in folders_queryset:
810-
f.delete()
811+
folders_queryset.delete()
811812
else:
812813
for f in folders_queryset:
813814
self.log_deletion(request, f, force_str(f))

0 commit comments

Comments
 (0)