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

fix(users): 组织管理员，移除组织成员报错500 #231

Browse Source
This commit is contained in:
xinwen
2020-08-19 17:59:25 +08:00
committed by 老广
parent 64d093e677
commit fcd8356e90
5 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
can_delete = serializers.SerializerMethodField()
org_roles = serializers.ListField(label=_('Organization role name'), allow_null=True, required=False,
child=serializers.ChoiceField(choices=ORG_ROLE.choices))
total_role_display = serializers.SerializerMethodField(label=_('Total role name'))
key_prefix_block = "_LOGIN_BLOCK_{}"
class Meta:
@@ -87,6 +86,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
'source_display': {'label': _('Source name')},
'org_role_display': {'label': _('Organization role name')},
'role_display': {'label': _('Super role name')},
'total_role_display': {'label': _('Total role name')}
}
def __init__(self, *args, **kwargs):
@@ -105,14 +105,6 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
choices.pop(User.ROLE.AUDITOR, None)
role._choices = choices
def get_total_role_display(self, instance):
role_display = instance.role_display
org_role_display = instance.org_role_display
if role_display == org_role_display:
return role_display
else:
return f'{role_display} | {org_role_display}'
def validate_role(self, value):
request = self.context.get('request')
if not request.user.is_superuser and value != User.ROLE.USER: