提交 7b099395 编写于 作者: X xinwen

[Update] orgs.serializers.OrgReadSerializer add `id`

上级 701582fe
...@@ -6,6 +6,7 @@ from users.models import User, UserGroup ...@@ -6,6 +6,7 @@ from users.models import User, UserGroup
from assets.models import Asset, Domain, AdminUser, SystemUser, Label from assets.models import Asset, Domain, AdminUser, SystemUser, Label
from perms.models import AssetPermission from perms.models import AssetPermission
from common.serializers import AdaptedBulkListSerializer from common.serializers import AdaptedBulkListSerializer
from users.serializers import UserOrgSerializer
from .utils import set_current_org, get_current_org from .utils import set_current_org, get_current_org
from .models import Organization from .models import Organization
from .mixins.serializers import OrgMembershipSerializerMixin from .mixins.serializers import OrgMembershipSerializerMixin
...@@ -20,9 +21,9 @@ class OrgSerializer(ModelSerializer): ...@@ -20,9 +21,9 @@ class OrgSerializer(ModelSerializer):
class OrgReadSerializer(ModelSerializer): class OrgReadSerializer(ModelSerializer):
admins = serializers.SlugRelatedField(slug_field='name', many=True, read_only=True) admins = UserOrgSerializer(many=True, read_only=True)
auditors = serializers.SlugRelatedField(slug_field='name', many=True, read_only=True) auditors = UserOrgSerializer(many=True, read_only=True)
users = serializers.SlugRelatedField(slug_field='name', many=True, read_only=True) users = UserOrgSerializer(many=True, read_only=True)
user_groups = serializers.SerializerMethodField() user_groups = serializers.SerializerMethodField()
assets = serializers.SerializerMethodField() assets = serializers.SerializerMethodField()
domains = serializers.SerializerMethodField() domains = serializers.SerializerMethodField()
......
...@@ -14,7 +14,7 @@ from ..models import User ...@@ -14,7 +14,7 @@ from ..models import User
__all__ = [ __all__ = [
'UserSerializer', 'UserPKUpdateSerializer', 'UserSerializer', 'UserPKUpdateSerializer',
'ChangeUserPasswordSerializer', 'ResetOTPSerializer', 'ChangeUserPasswordSerializer', 'ResetOTPSerializer',
'UserProfileSerializer', 'UserProfileSerializer', 'UserOrgSerializer'
] ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册