Skip to content

Commit ba79dd8

Browse files
committed
refactor: user add role setting
1 parent bbc7dbc commit ba79dd8

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

apps/locales/zh_CN/LC_MESSAGES/django.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3691,7 +3691,7 @@ msgstr "获取工作空间下用户列表"
36913691

36923692
#: users/views/user.py:87 users/views/user.py:88 users/views/user.py:89
36933693
msgid "Create user"
3694-
msgstr "创建者"
3694+
msgstr "创建用户"
36953695

36963696
#: users/views/user.py:101 users/views/user.py:102 users/views/user.py:103
36973697
msgid "Get default password"

apps/users/api/user.py

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,19 @@ def get_data(self):
2222
return UserProfileResponse()
2323

2424

25+
class RoleSettingRequestSerializer(serializers.Serializer):
26+
role_id = serializers.CharField(required=True, label=_('Role ID'))
27+
workspace_ids = serializers.ListField(
28+
child=serializers.CharField(required=True),
29+
required=True,
30+
label=_('Workspace IDs')
31+
)
32+
33+
34+
class CreateUserRequestSerializer(CreateUserSerializer):
35+
role_setting = RoleSettingRequestSerializer(required=False, label=_('Role Setting'), allow_null=True, many=True)
36+
37+
2538
class UserProfileAPI(APIMixin):
2639

2740
@staticmethod
@@ -30,7 +43,7 @@ def get_response():
3043

3144
@staticmethod
3245
def get_request():
33-
return CreateUserSerializer
46+
return CreateUserRequestSerializer
3447

3548
@staticmethod
3649
def get_parameters():
@@ -85,6 +98,10 @@ def get_data(self):
8598
return Password()
8699

87100

101+
class EditUserRequestSerializer(UserManageSerializer.UserEditInstance):
102+
role_setting = RoleSettingRequestSerializer(required=False, label=_('Role Setting'), allow_null=True, many=True)
103+
104+
88105
class EditUserApi(APIMixin):
89106
@staticmethod
90107
def get_parameters():
@@ -98,7 +115,7 @@ def get_parameters():
98115

99116
@staticmethod
100117
def get_request():
101-
return UserManageSerializer.UserEditInstance
118+
return EditUserRequestSerializer
102119

103120

104121
class DeleteUserApi(APIMixin):

0 commit comments

Comments
 (0)