Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
492b1c43
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,发现更多精彩内容 >>
提交
492b1c43
编写于
5月 21, 2020
作者:
X
xinwen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Update] org retrieve api
上级
0babada4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
11 deletion
+19
-11
apps/orgs/api.py
apps/orgs/api.py
+6
-5
apps/orgs/serializers.py
apps/orgs/serializers.py
+13
-6
未找到文件。
apps/orgs/api.py
浏览文件 @
492b1c43
...
@@ -10,7 +10,7 @@ from common.permissions import IsSuperUserOrAppUser
...
@@ -10,7 +10,7 @@ from common.permissions import IsSuperUserOrAppUser
from
.models
import
Organization
from
.models
import
Organization
from
.serializers
import
OrgSerializer
,
OrgReadSerializer
,
\
from
.serializers
import
OrgSerializer
,
OrgReadSerializer
,
\
OrgMembershipUserSerializer
,
OrgMembershipAdminSerializer
,
\
OrgMembershipUserSerializer
,
OrgMembershipAdminSerializer
,
\
OrgAllUserSerializer
OrgAllUserSerializer
,
OrgRetrieveSerializer
from
users.models
import
User
,
UserGroup
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
...
@@ -28,10 +28,11 @@ class OrgViewSet(BulkModelViewSet):
...
@@ -28,10 +28,11 @@ class OrgViewSet(BulkModelViewSet):
org
=
None
org
=
None
def
get_serializer_class
(
self
):
def
get_serializer_class
(
self
):
if
self
.
action
in
(
'list'
,
'retrieve'
):
mapper
=
{
return
OrgReadSerializer
'list'
:
OrgReadSerializer
,
else
:
'retrieve'
:
OrgRetrieveSerializer
return
super
().
get_serializer_class
()
}
return
mapper
.
get
(
self
.
action
,
super
().
get_serializer_class
())
def
get_data_from_model
(
self
,
model
):
def
get_data_from_model
(
self
,
model
):
if
model
==
User
:
if
model
==
User
:
...
...
apps/orgs/serializers.py
浏览文件 @
492b1c43
import
re
from
rest_framework.serializers
import
ModelSerializer
from
rest_framework.serializers
import
ModelSerializer
from
rest_framework
import
serializers
from
rest_framework
import
serializers
from
users.models
import
User
,
User
Group
from
users.models
import
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
...
@@ -21,9 +19,9 @@ class OrgSerializer(ModelSerializer):
...
@@ -21,9 +19,9 @@ class OrgSerializer(ModelSerializer):
class
OrgReadSerializer
(
ModelSerializer
):
class
OrgReadSerializer
(
ModelSerializer
):
admins
=
UserOrgSerializer
(
many
=
True
,
read_only
=
True
)
admins
=
serializers
.
SlugRelatedField
(
slug_field
=
'name'
,
many
=
True
,
read_only
=
True
)
auditors
=
UserOrgSerializer
(
many
=
True
,
read_only
=
True
)
auditors
=
serializers
.
SlugRelatedField
(
slug_field
=
'name'
,
many
=
True
,
read_only
=
True
)
users
=
UserOrgSerializer
(
many
=
True
,
read_only
=
True
)
users
=
serializers
.
SlugRelatedField
(
slug_field
=
'name'
,
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
()
...
@@ -93,3 +91,12 @@ class OrgAllUserSerializer(serializers.Serializer):
...
@@ -93,3 +91,12 @@ class OrgAllUserSerializer(serializers.Serializer):
@
staticmethod
@
staticmethod
def
get_user_display
(
obj
):
def
get_user_display
(
obj
):
return
str
(
obj
)
return
str
(
obj
)
class
OrgRetrieveSerializer
(
OrgReadSerializer
):
admins
=
serializers
.
PrimaryKeyRelatedField
(
many
=
True
,
read_only
=
True
)
auditors
=
serializers
.
PrimaryKeyRelatedField
(
many
=
True
,
read_only
=
True
)
users
=
serializers
.
PrimaryKeyRelatedField
(
many
=
True
,
read_only
=
True
)
class
Meta
(
OrgReadSerializer
.
Meta
):
pass
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录