From 396bc9b6aee08d03f3a728df295073a559611317 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 10 Apr 2020 12:47:16 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?ViewSet=E5=BA=8F=E5=88=97=E7=B1=BB=E8=BF=94=E5=9B=9E=E7=9A=84ad?= =?UTF-8?q?min=5Forgs=EF=BC=88=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB=E5=BD=95=E7=9A=84Bug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/models/user.py | 8 ++++---- apps/users/serializers/user.py | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 169a30a00..ce803064a 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -563,10 +563,10 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser): user_default = settings.STATIC_URL + "img/avatar/user.png" return user_default - def admin_orgs(self): - from orgs.models import Organization - orgs = Organization.get_user_admin_or_audit_orgs(self) - return orgs + # def admin_orgs(self): + # from orgs.models import Organization + # orgs = Organization.get_user_admin_or_audit_orgs(self) + # return orgs def avatar_url(self): admin_default = settings.STATIC_URL + "img/avatar/admin.png" diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index c961cccb4..87ce80e5d 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -178,7 +178,7 @@ class ResetOTPSerializer(serializers.Serializer): class UserProfileSerializer(serializers.ModelSerializer): - admin_orgs = UserOrgSerializer(many=True, read_only=True) + admin_or_audit_orgs = UserOrgSerializer(many=True, read_only=True) class Meta: model = User @@ -188,7 +188,5 @@ class UserProfileSerializer(serializers.ModelSerializer): 'comment', 'source', 'is_valid', 'is_expired', 'is_active', 'created_by', 'is_first_login', 'date_password_last_updated', 'date_expired', - 'avatar_url', - - 'groups', 'admin_orgs', + 'avatar_url', 'groups', 'admin_or_audit_orgs', ]