github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 10:20:57 +00:00
Code Issues Projects Releases Wiki Activity

fix(users): 用户接口添加汇总角色字段

Browse Source
This commit is contained in:
xinwen
2020-08-07 17:40:10 +08:00
committed by 老广
parent ec2b3b4cda
commit f1e29a91f7
3 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/users/serializers/user.py
View File

@@ -56,6 +56,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
allow_null=True, required=False, allow_blank=True,
choices=ORG_ROLE.choices
)
total_role_display = serializers.SerializerMethodField(label=_('Total role name'))
key_prefix_block = "_LOGIN_BLOCK_{}"
class Meta:
@@ -67,7 +68,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
fields_small = fields_mini + [
'password', 'email', 'public_key', 'wechat', 'phone', 'mfa_level', 'mfa_enabled',
'mfa_level_display', 'mfa_force_enabled', 'role_display', 'org_role_display',
'comment', 'source', 'is_valid', 'is_expired',
'total_role_display', 'comment', 'source', 'is_valid', 'is_expired',
'is_active', 'created_by', 'is_first_login',
'password_strategy', 'date_password_last_updated', 'date_expired',
'avatar_url', 'source_display', 'date_joined', 'last_login'
@@ -109,6 +110,9 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
choices.pop(User.ROLE.AUDITOR, None)
role._choices = choices
def get_total_role_display(self, instance):
return ' | '.join({str(instance.role_display), str(instance.org_role_display)})
def validate_role(self, value):
request = self.context.get('request')
if not request.user.is_superuser and value != User.ROLE.USER: