panyy
/
UnisKB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Folder move order by name

v3.2
zhangzhanwei 2025-11-04 17:47:44 +08:00 committed by zhanweizhang7
parent 9fb5e2a084
commit 26a3067992
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/folders/serializers/folder.py
View File

@ -189,6 +189,7 @@ class FolderSerializer(serializers.Serializer):
field in instance and instance.get(field) is not None)} field in instance and instance.get(field) is not None)}
QuerySet(Folder).filter(id=current_id).update(**edit_dict) QuerySet(Folder).filter(id=current_id).update(**edit_dict)
current_node.refresh_from_db()
if parent_id is not None and current_id != current_node.workspace_id and current_node.parent_id != parent_id: if parent_id is not None and current_id != current_node.workspace_id and current_node.parent_id != parent_id:
@ -204,7 +205,9 @@ class FolderSerializer(serializers.Serializer):
workspace_id=current_node.workspace_id).exists(): workspace_id=current_node.workspace_id).exists():
raise serializers.ValidationError(_('Folder name already exists')) raise serializers.ValidationError(_('Folder name already exists'))
current_node.move_to(parent) current_node.parent = parent
current_node.save()
current_node.refresh_from_db()
else: else:
raise AppApiException(403, _('No permission for the target folder')) raise AppApiException(403, _('No permission for the target folder'))

1
ui/src/components/folder-tree/index.vue
View File

@ -242,7 +242,6 @@ const handleDrop = (draggingNode: any, dropNode: any, dropType: string, ev: Drag
emit('refreshTree') emit('refreshTree')
}) })
.catch(() => { .catch(() => {
MsgError(t('components.folder.requiredMessage'))
emit('refreshTree') emit('refreshTree')
}) })
} }