github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 后台不限制roles的必填项

pull/7751/head
Jiangjie.Bai 2022-03-07 11:41:23 +08:00 committed by Jiangjie.Bai
parent 0afff45bae
commit 46e119db1f
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/users/serializers/profile.py
View File

@ -147,8 +147,6 @@ class UserProfileSerializer(UserSerializer):
'date_expired': {'read_only': True}, 'date_expired': {'read_only': True},
'date_joined': {'read_only': True}, 'date_joined': {'read_only': True},
'last_login': {'read_only': True}, 'last_login': {'read_only': True},
'system_roles': {'read_only': True},
'org_roles': {'read_only': True},
}) })
if 'password' in fields: if 'password' in fields:

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

@ -21,7 +21,6 @@ __all__ = [
class RolesSerializerMixin(serializers.Serializer): class RolesSerializerMixin(serializers.Serializer):
system_roles = serializers.ManyRelatedField( system_roles = serializers.ManyRelatedField(
allow_empty=False,
child_relation=serializers.PrimaryKeyRelatedField(queryset=Role.system_roles), child_relation=serializers.PrimaryKeyRelatedField(queryset=Role.system_roles),
label=_('System roles'), label=_('System roles'),
) )
@ -70,16 +69,6 @@ class RolesSerializerMixin(serializers.Serializer):
self.pop_roles_if_need(fields) self.pop_roles_if_need(fields)
return fields return fields
@staticmethod
def _validate_org_roles(attrs):
if current_org.is_root():
attrs.pop('org_roles', None)
return attrs
org_roles = attrs.get('org_roles', None)
if not org_roles:
raise serializers.ValidationError({'org_roles': _('This field is required.')})
return attrs
class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializers.ModelSerializer): class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializers.ModelSerializer):
password_strategy = serializers.ChoiceField( password_strategy = serializers.ChoiceField(
@ -188,7 +177,6 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
return attrs return attrs
def validate(self, attrs): def validate(self, attrs):
attrs = self._validate_org_roles(attrs)
attrs = self.change_password_to_raw(attrs) attrs = self.change_password_to_raw(attrs)
attrs = self.clean_auth_fields(attrs) attrs = self.clean_auth_fields(attrs)
attrs.pop('password_strategy', None) attrs.pop('password_strategy', None)