Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
44a42e47
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 搜索 >>
提交
44a42e47
编写于
1月 19, 2021
作者:
B
Bai
提交者:
Jiangjie.Bai
1月 19, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修改用户相关tickets为自己申请的或者待受理的
上级
4de2ae60
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
30 deletion
+4
-30
apps/tickets/api/ticket.py
apps/tickets/api/ticket.py
+1
-1
apps/tickets/models/ticket.py
apps/tickets/models/ticket.py
+3
-29
未找到文件。
apps/tickets/api/ticket.py
浏览文件 @
44a42e47
...
...
@@ -50,7 +50,7 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
instance
=
serializer
.
save
()
instance
.
open
(
applicant
=
self
.
request
.
user
)
@
action
(
detail
=
False
,
methods
=
[
POST
])
@
action
(
detail
=
False
,
methods
=
[
POST
]
,
permission_classes
=
[
IsValidUser
,
]
)
def
open
(
self
,
request
,
*
args
,
**
kwargs
):
return
super
().
create
(
request
,
*
args
,
**
kwargs
)
...
...
apps/tickets/models/ticket.py
浏览文件 @
44a42e47
...
...
@@ -148,35 +148,9 @@ class Ticket(CommonModelMixin, OrgModelMixin):
@
classmethod
def
get_user_related_tickets
(
cls
,
user
):
queries
=
None
tickets
=
cls
.
all
()
if
user
.
is_superuser
:
pass
elif
user
.
is_super_auditor
:
pass
elif
user
.
is_org_admin
:
admin_orgs_id
=
[
str
(
org_id
)
for
org_id
in
user
.
admin_orgs
.
values_list
(
'id'
,
flat
=
True
)
]
assigned_tickets_id
=
[
str
(
ticket_id
)
for
ticket_id
in
user
.
assigned_tickets
.
values_list
(
'id'
,
flat
=
True
)
]
queries
=
Q
(
applicant
=
user
)
queries
|=
Q
(
processor
=
user
)
queries
|=
Q
(
org_id__in
=
admin_orgs_id
)
queries
|=
Q
(
id__in
=
assigned_tickets_id
)
elif
user
.
is_org_auditor
:
audit_orgs_id
=
[
str
(
org_id
)
for
org_id
in
user
.
audit_orgs
.
values_list
(
'id'
,
flat
=
True
)
]
queries
=
Q
(
org_id__in
=
audit_orgs_id
)
elif
user
.
is_common_user
:
queries
=
Q
(
applicant
=
user
)
else
:
tickets
=
cls
.
objects
.
none
()
if
queries
:
tickets
=
tickets
.
filter
(
queries
)
return
tickets
.
distinct
()
queries
=
Q
(
applicant
=
user
)
|
Q
(
assignees
=
user
)
tickets
=
cls
.
all
().
filter
(
queries
).
distinct
()
return
tickets
@
classmethod
def
all
(
cls
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录