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

[Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)

pull/3869/head
Bai 2020-04-10 12:47:16 +08:00
parent cd7946f3f0
commit 396bc9b6ae
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/users/models/user.py
View File

@ -563,10 +563,10 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
user_default = settings.STATIC_URL + "img/avatar/user.png" user_default = settings.STATIC_URL + "img/avatar/user.png"
return user_default return user_default
def admin_orgs(self): # def admin_orgs(self):
from orgs.models import Organization # from orgs.models import Organization
orgs = Organization.get_user_admin_or_audit_orgs(self) # orgs = Organization.get_user_admin_or_audit_orgs(self)
return orgs # return orgs
def avatar_url(self): def avatar_url(self):
admin_default = settings.STATIC_URL + "img/avatar/admin.png" admin_default = settings.STATIC_URL + "img/avatar/admin.png"

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

@ -178,7 +178,7 @@ class ResetOTPSerializer(serializers.Serializer):
class UserProfileSerializer(serializers.ModelSerializer): class UserProfileSerializer(serializers.ModelSerializer):
admin_orgs = UserOrgSerializer(many=True, read_only=True) admin_or_audit_orgs = UserOrgSerializer(many=True, read_only=True)
class Meta: class Meta:
model = User model = User
@ -188,7 +188,5 @@ class UserProfileSerializer(serializers.ModelSerializer):
'comment', 'source', 'is_valid', 'is_expired', 'comment', 'source', 'is_valid', 'is_expired',
'is_active', 'created_by', 'is_first_login', 'is_active', 'created_by', 'is_first_login',
'date_password_last_updated', 'date_expired', 'date_password_last_updated', 'date_expired',
'avatar_url', 'avatar_url', 'groups', 'admin_or_audit_orgs',
'groups', 'admin_orgs',
] ]