From a14f121fadf283ed930df4e8e29810d7e890bfcb Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 5 Aug 2020 18:26:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(orgs):=20=E7=BB=84=E7=BB=87=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=85=B3=E7=B3=BB=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?`role=5Fdisplay`=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/serializers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/orgs/serializers.py b/apps/orgs/serializers.py index 5b20ce47e..d7e8ae2d1 100644 --- a/apps/orgs/serializers.py +++ b/apps/orgs/serializers.py @@ -6,7 +6,7 @@ from users.models.user import User from common.serializers import AdaptedBulkListSerializer from common.drf.serializers import BulkModelSerializer from common.db.models import concated_display as display -from .models import Organization, OrganizationMember +from .models import Organization, OrganizationMember, ROLE as ORG_ROLE class OrgSerializer(ModelSerializer): @@ -54,10 +54,11 @@ class OrgReadSerializer(OrgSerializer): class OrgMemberSerializer(BulkModelSerializer): org_display = serializers.CharField() user_display = serializers.CharField() + role_display = serializers.CharField(source='get_role_display') class Meta: - model = Organization.members.through - fields = ('id', 'org', 'user', 'role', 'org_display', 'user_display') + model = OrganizationMember + fields = ('id', 'org', 'user', 'role', 'org_display', 'user_display', 'role_display') @classmethod def setup_eager_loading(cls, queryset):