Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
7b099395
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b099395
编写于
5月 21, 2020
作者:
X
xinwen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Update] orgs.serializers.OrgReadSerializer add `id`
上级
701582fe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
4 deletion
+5
-4
apps/orgs/serializers.py
apps/orgs/serializers.py
+4
-3
apps/users/serializers/user.py
apps/users/serializers/user.py
+1
-1
未找到文件。
apps/orgs/serializers.py
浏览文件 @
7b099395
...
@@ -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
()
...
...
apps/users/serializers/user.py
浏览文件 @
7b099395
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录