zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update folder serializer to remove allow_null and allow_blank from workspace_id and parent_id

Browse Source
This commit is contained in:
CaptainB 2025-06-04 20:30:00 +08:00
parent 1641039fd2
commit 26f84338d6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,8 @@ class FolderSerializer(serializers.Serializer):
name = serializers.CharField(required=True, label=_('folder name')) name = serializers.CharField(required=True, label=_('folder name'))
desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('folder description')) desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('folder description'))
user_id = serializers.CharField(required=True, label=_('folder user id')) user_id = serializers.CharField(required=True, label=_('folder user id'))
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('workspace id')) workspace_id = serializers.CharField(required=False, label=_('workspace id'))
parent_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('parent id')) parent_id = serializers.CharField(required=False, label=_('parent id'))
class Create(serializers.Serializer): class Create(serializers.Serializer):
user_id = serializers.UUIDField(required=True, label=_('user id')) user_id = serializers.UUIDField(required=True, label=_('user id'))
@ -110,8 +110,12 @@ class FolderSerializer(serializers.Serializer):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
FolderCreateRequest(data=instance).is_valid(raise_exception=True) FolderCreateRequest(data=instance).is_valid(raise_exception=True)
workspace_id = self.data.get('workspace_id', 'default') workspace_id = self.data.get('workspace_id')
parent_id = instance.get('parent_id', 'root') if not workspace_id:
workspace_id = 'default'
parent_id = instance.get('parent_id')
if not parent_id:
parent_id = 'root'
name = instance.get('name') name = instance.get('name')
Folder = get_folder_type(self.data.get('source')) # noqa Folder = get_folder_type(self.data.get('source')) # noqa