From cc3911d2f1179eec35cc9e7dfb2ddb578511039d Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Mar 2021 19:35:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20user=20profile=20al?= =?UTF-8?q?l=20orgs=20=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/models.py | 5 +---- apps/users/serializers/profile.py | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apps/orgs/models.py b/apps/orgs/models.py index d762e5eba..ac0830592 100644 --- a/apps/orgs/models.py +++ b/apps/orgs/models.py @@ -150,10 +150,7 @@ class Organization(models.Model): @classmethod def get_user_all_orgs(cls, user): - return [ - *cls.objects.filter(members=user).distinct(), - cls.default() - ] + return cls.objects.filter(members=user).distinct() @classmethod def get_user_admin_orgs(cls, user): diff --git a/apps/users/serializers/profile.py b/apps/users/serializers/profile.py index c89b173ff..1c5e99873 100644 --- a/apps/users/serializers/profile.py +++ b/apps/users/serializers/profile.py @@ -15,11 +15,6 @@ class UserOrgSerializer(serializers.Serializer): is_root = serializers.BooleanField(read_only=True) -class UserOrgLabelSerializer(serializers.Serializer): - value = serializers.CharField(source='id') - label = serializers.CharField(source='name') - - class UserUpdatePasswordSerializer(serializers.ModelSerializer): old_password = serializers.CharField(required=True, max_length=128, write_only=True) new_password = serializers.CharField(required=True, max_length=128, write_only=True) @@ -89,7 +84,7 @@ class UserRoleSerializer(serializers.Serializer): class UserProfileSerializer(UserSerializer): admin_or_audit_orgs = UserOrgSerializer(many=True, read_only=True) - user_all_orgs = UserOrgLabelSerializer(many=True, read_only=True) + user_all_orgs = UserOrgSerializer(many=True, read_only=True) current_org_roles = serializers.ListField(read_only=True) public_key_comment = serializers.CharField( source='get_public_key_comment', required=False, read_only=True, max_length=128