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

fix(orgs): 组织成员关系接口添加`role_display`字段

pull/4456/head
xinwen 2020-08-05 18:26:07 +08:00 committed by 老广
parent a25da8d479
commit a14f121fad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/orgs/serializers.py
View File

@ -6,7 +6,7 @@ from users.models.user import User
from common.serializers import AdaptedBulkListSerializer from common.serializers import AdaptedBulkListSerializer
from common.drf.serializers import BulkModelSerializer from common.drf.serializers import BulkModelSerializer
from common.db.models import concated_display as display 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): class OrgSerializer(ModelSerializer):
@ -54,10 +54,11 @@ class OrgReadSerializer(OrgSerializer):
class OrgMemberSerializer(BulkModelSerializer): class OrgMemberSerializer(BulkModelSerializer):
org_display = serializers.CharField() org_display = serializers.CharField()
user_display = serializers.CharField() user_display = serializers.CharField()
role_display = serializers.CharField(source='get_role_display')
class Meta: class Meta:
model = Organization.members.through model = OrganizationMember
fields = ('id', 'org', 'user', 'role', 'org_display', 'user_display') fields = ('id', 'org', 'user', 'role', 'org_display', 'user_display', 'role_display')
@classmethod @classmethod
def setup_eager_loading(cls, queryset): def setup_eager_loading(cls, queryset):