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

Merge pull request #4025 from jumpserver/update-org-user-add-id 

[Update] orgs.serializers.OrgReadSerializer add `id`
pull/4027/head
老广 2020-05-21 02:43:35 -05:00 committed by GitHub
parent 701582fe38 7b0993959e
commit 0babada459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/orgs/serializers.py
View File

@ -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):
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()

2
apps/users/serializers/user.py
View File

@ -14,7 +14,7 @@ from ..models import User
__all__ = [ __all__ = [
'UserSerializer', 'UserPKUpdateSerializer', 'UserSerializer', 'UserPKUpdateSerializer',
'ChangeUserPasswordSerializer', 'ResetOTPSerializer', 'ChangeUserPasswordSerializer', 'ResetOTPSerializer',
'UserProfileSerializer', 'UserProfileSerializer', 'UserOrgSerializer'
] ]