Skip to content

fix: When moving or editing a folder, if there is a folder with the same name in the target directory, the prompt message suggests optimization #5170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Apr 27, 2026
Merged

fix: When moving or editing a folder, if there is a folder with the same name in the target directory, the prompt message suggests optimization #5170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/folders/serializers/folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def has_exact_permission_by_role(user_id: str, workspace_id: str, permission_id:

return False


def get_source_type(source):
if source == Group.TOOL.name:
return Tool
Expand Down Expand Up @@ -149,7 +150,7 @@ def insert(self, instance, with_valid=True):

Folder = get_folder_type(self.data.get('source')) # noqa
if QuerySet(Folder).filter(name=name, workspace_id=workspace_id, parent_id=parent_id).exists():
raise Exception(_('Folder name already exists'))
raise AppApiException(500, _('Folder name already exists'))
# Folder 不能超过3层
check_depth(self.data.get('source'), parent_id, workspace_id)

Expand Down Expand Up @@ -197,7 +198,7 @@ def edit(self, instance):
parent_id=parent_id,
workspace_id=current_node.workspace_id
).exclude(id=current_id).exists():
raise serializers.ValidationError(_('Folder name already exists'))
raise AppApiException(500, _('Folder name already exists'))

edit_field_list = ['name', 'desc']
edit_dict = {field: instance.get(field) for field in edit_field_list if (
Expand All @@ -218,7 +219,7 @@ def edit(self, instance):

if QuerySet(Folder).filter(name=current_node.name, parent_id=parent_id,
workspace_id=current_node.workspace_id).exists():
raise serializers.ValidationError(_('Folder name already exists'))
raise AppApiException(500, _('Folder name already exists'))

current_node.parent = parent
current_node.save()
Expand Down Expand Up @@ -352,7 +353,9 @@ def get_folder_tree(self,
if name is not None:
base_q &= Q(name__contains=name)
if not workspace_manage:
having_read_permission_by_role = has_exact_permission_by_role(user_id, workspace_id, f"{source}_FOLDER:READ", RoleConstants.USER.value.__str__())
having_read_permission_by_role = has_exact_permission_by_role(user_id, workspace_id,
f"{source}_FOLDER:READ",
RoleConstants.USER.value.__str__())
permission_condition = ['VIEW']
if having_read_permission_by_role:
permission_condition = ['VIEW', 'ROLE']
Expand Down
Loading