Skip to content

Commit 3f5180d

Browse files
committed
fix: remove default value for folder_id and use workspace_id instead
1 parent 6ad9682 commit 3f5180d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

apps/tools/serializers/tool.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class ToolCreateRequest(serializers.Serializer):
153153

154154
is_active = serializers.BooleanField(required=False, label=_('Is active'))
155155

156-
folder_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, default='root')
156+
folder_id = serializers.CharField(required=False, allow_null=True)
157157

158158

159159
class ToolEditRequest(serializers.Serializer):
@@ -173,7 +173,7 @@ class ToolEditRequest(serializers.Serializer):
173173

174174
is_active = serializers.BooleanField(required=False, label=_('Is active'))
175175

176-
folder_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, default='root')
176+
folder_id = serializers.CharField(required=False, allow_null=True)
177177

178178

179179
class DebugField(serializers.Serializer):
@@ -212,7 +212,7 @@ def insert(self, instance, with_valid=True):
212212
input_field_list=instance.get('input_field_list', []),
213213
init_field_list=instance.get('init_field_list', []),
214214
scope=instance.get('scope', ToolScope.WORKSPACE),
215-
folder_id=instance.get('folder_id', 'root'),
215+
folder_id=instance.get('folder_id', self.data.get('workspace_id')),
216216
is_active=False)
217217
tool.save()
218218
return ToolModelSerializer(tool).data
@@ -440,7 +440,7 @@ class ToolTreeSerializer(serializers.Serializer):
440440
def get_tools(self, folder_id):
441441
self.is_valid(raise_exception=True)
442442
if not folder_id:
443-
folder_id = 'root'
443+
folder_id = self.data.get('workspace_id')
444444
# 获取当前文件夹
445445
current_folder = ToolFolder.objects.filter(id=folder_id).first()
446446
if not current_folder:
@@ -471,7 +471,7 @@ class Query(serializers.Serializer):
471471
def page_tool(self, current_page: int, page_size: int):
472472
self.is_valid(raise_exception=True)
473473

474-
folder_id = self.data.get('folder_id', 'root')
474+
folder_id = self.data.get('folder_id', self.data.get('workspace_id'))
475475
root = ToolFolder.objects.filter(id=folder_id).first()
476476
if not root:
477477
raise serializers.ValidationError(_('Folder not found'))

0 commit comments

Comments
 (0)