Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
8f7ae26b
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,体验更适合开发者的 AI 搜索 >>
提交
8f7ae26b
编写于
6月 15, 2020
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 暂存
上级
865df56b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
18 deletion
+7
-18
apps/orgs/models.py
apps/orgs/models.py
+5
-10
apps/orgs/serializers.py
apps/orgs/serializers.py
+2
-8
未找到文件。
apps/orgs/models.py
浏览文件 @
8f7ae26b
...
...
@@ -106,11 +106,8 @@ class Organization(models.Model):
else
:
return
''
def
org_auditors
(
self
):
return
self
.
members
.
filter
(
role
=
OrganizationMembers
.
ROLE_AUDITOR
)
def
get_org_auditors
(
self
):
return
self
.
org_auditors
(
)
return
self
.
members
.
filter
(
role
=
OrganizationMembers
.
ROLE_AUDITOR
)
def
get_org_members
(
self
,
role
=
None
):
from
users.models
import
User
...
...
@@ -138,21 +135,19 @@ class Organization(models.Model):
return
self
.
id
not
in
(
self
.
DEFAULT_NAME
,
self
.
ROOT_ID
,
self
.
SYSTEM_ID
)
@
classmethod
def
get_user_joined_orgs
(
cls
,
user
,
role
=
None
,
role_in
=
None
):
def
get_user_joined_orgs
(
cls
,
user
,
role
s
=
None
):
if
user
.
is_anonymous
:
return
cls
.
objects
.
none
()
kwargs
=
{
'user'
:
user
}
if
role
:
kwargs
[
'role'
]
=
role
elif
role_in
:
kwargs
[
'role__in'
]
=
role_in
if
roles
:
kwargs
[
'role__in'
]
=
roles
orgs_id
=
OrganizationMembers
.
objects
.
filter
(
**
kwargs
).
values_list
(
'org'
,
flat
=
True
)
return
cls
.
objects
.
filter
(
id__in
=
orgs_id
)
@
classmethod
def
get_user_admin_or_audit_orgs
(
cls
,
user
):
roles
=
[
OrganizationMembers
.
ROLE_ADMIN
,
OrganizationMembers
.
ROLE_AUDITOR
]
return
cls
.
get_user_joined_orgs
(
role_in
=
roles
)
return
cls
.
get_user_joined_orgs
(
user
,
roles
=
roles
)
@
classmethod
def
default
(
cls
):
...
...
apps/orgs/serializers.py
浏览文件 @
8f7ae26b
...
...
@@ -13,12 +13,9 @@ class OrgSerializer(ModelSerializer):
fields_mini
=
[
'id'
,
'name'
]
fields_small
=
fields_mini
+
[
'comment'
,
'created_by'
,
'date_created'
]
fields
=
fields_small
field_m2m
=
[
'members'
]
read_only_fields
=
[
'created_by'
,
'date_created'
]
extra_kwargs
=
{
'admins'
:
{
'write_only'
:
True
},
'users'
:
{
'write_only'
:
True
},
'auditors'
:
{
'write_only'
:
True
},
}
class
OrgReadSerializer
(
ModelSerializer
):
admins_amount
=
serializers
.
SlugRelatedField
(
slug_field
=
'name'
,
many
=
True
,
read_only
=
True
)
...
...
@@ -63,6 +60,3 @@ 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录