Skip to content

Commit 743b04a

Browse files
committed
refactor: user role
1 parent 129d52d commit 743b04a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

apps/users/serializers/user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ def get_user_list(self, workspace_id):
373373
users = User.objects.filter(id__in=user_ids).values('id', 'nick_name')
374374
return list(users)
375375

376+
376377
def update_user_role(instance, user):
377378
workspace_user_role_mapping_model = DatabaseModelManage.get_model("workspace_user_role_mapping")
378379
role_setting_model = DatabaseModelManage.get_model("role_model")
@@ -386,7 +387,7 @@ def update_user_role(instance, user):
386387

387388
role_ids = {role_id for item in role_setting for role_id in item}
388389
role_ids_is_system = role_setting_model.objects.filter(id__in=role_ids,
389-
type='SYSTEM_ADMIN').values_list(
390+
type=RoleConstants.ADMIN.name).values_list(
390391
'id', flat=True)
391392
if role_ids_is_system:
392393
relations = {(role_id, 'SYSTEM') if role_id in role_ids_is_system else (role_id, workspace_id)
@@ -398,4 +399,3 @@ def update_user_role(instance, user):
398399
workspace_id=workspace_id,
399400
user_id=user.id
400401
)
401-

0 commit comments

Comments
 (0)