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

Merge pull request #3660 from jumpserver/dev_auth 

[Update] 修复用户更新页面会清空用户public_key的问题
pull/3661/head
BaiJiangJie 2020-01-20 11:28:40 +08:00 committed by GitHub
parent 13a042bc0f da6a0c286d
commit b227d9cdc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,17 @@ class UserSerializer(BulkSerializerMixin, serializers.ModelSerializer):
attrs['password_raw'] = password attrs['password_raw'] = password
return attrs return attrs
@staticmethod
def clean_auth_fields(attrs):
for field in ('password', 'public_key'):
value = attrs.get(field)
if not value:
attrs.pop(field, None)
return attrs
def validate(self, attrs): def validate(self, attrs):
attrs = self.change_password_to_raw(attrs) attrs = self.change_password_to_raw(attrs)
attrs = self.clean_auth_fields(attrs)
return attrs return attrs