Skip to content

Commit ff0173a

Browse files
committed
fix problem with moving inode to trash folder
1 parent 2f79fec commit ff0173a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

finder/admin/folder.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def upload_file(self, request, folder_id):
218218
folder=folder,
219219
owner=request.user,
220220
)
221-
return JsonResponse({'uploaded_file': new_file.as_dict})
221+
return JsonResponse({'file_info': new_file.as_dict})
222222

223223
def update_inode(self, request, folder_id):
224224
if response := self.check_for_valid_post_request(request, folder_id):
@@ -307,9 +307,9 @@ def delete_inodes(self, request, folder_id):
307307
inode = FolderModel.objects.get_inode(id=entry['id'])
308308
if entry['is_folder']:
309309
PinnedFolder.objects.filter(folder=inode).delete()
310-
while next(trash_folder.listdir(name=inode.name, is_folder=True), None):
310+
while trash_folder.listdir(name=inode.name, is_folder=True).exists():
311311
inode.name = f"{inode.name}.renamed"
312-
inode.save(update_fields=['name'])
312+
inode.save(update_fields=['name'])
313313
DiscardedInode.objects.create(
314314
inode=inode.id,
315315
previous_parent=inode.parent,

0 commit comments

Comments
 (0)