Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
24b1c871
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 搜索 >>
提交
24b1c871
编写于
1月 02, 2021
作者:
B
Bai
提交者:
Jiangjie.Bai
1月 02, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perf: 修改细节
上级
cef93abb
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
16 addition
and
12 deletion
+16
-12
apps/tickets/api/assignee.py
apps/tickets/api/assignee.py
+3
-3
apps/tickets/api/comment.py
apps/tickets/api/comment.py
+1
-1
apps/tickets/api/ticket/ticket.py
apps/tickets/api/ticket/ticket.py
+5
-5
apps/tickets/migrations/0007_auto_20201224_1821.py
apps/tickets/migrations/0007_auto_20201224_1821.py
+6
-1
apps/tickets/models/ticket/model.py
apps/tickets/models/ticket/model.py
+1
-1
apps/tickets/permissions/ticket.py
apps/tickets/permissions/ticket.py
+0
-1
未找到文件。
apps/tickets/api/assignee.py
浏览文件 @
24b1c871
# -*- coding: utf-8 -*-
#
from
rest_framework
import
viewsets
from
users.models
import
User
from
common.permissions
import
IsValidUser
from
common.exceptions
import
JMSException
from
users.models
import
User
from
orgs.utils
import
get_org_by_id
from
..
import
serializers
...
...
@@ -20,7 +19,8 @@ class AssigneeViewSet(viewsets.ReadOnlyModelViewSet):
org_id
=
self
.
request
.
query_params
.
get
(
'org_id'
)
org
=
get_org_by_id
(
org_id
)
if
not
org
:
raise
JMSException
(
'The organization `{}` does not exist'
.
format
(
org_id
))
error
=
(
'The organization `{}` does not exist'
.
format
(
org_id
))
raise
JMSException
(
error
)
return
org
def
get_queryset
(
self
):
...
...
apps/tickets/api/comment.py
浏览文件 @
24b1c871
...
...
@@ -15,7 +15,7 @@ __all__ = ['CommentViewSet']
class
CommentViewSet
(
mixins
.
CreateModelMixin
,
viewsets
.
ReadOnlyModelViewSet
):
serializer_class
=
serializers
.
CommentSerializer
permission_classes
=
(
IsSwagger
|
IsAssignee
|
IsApplicant
,)
permission_classes
=
(
IsSwagger
|
IsAssignee
|
IsApplicant
,)
@
lazyproperty
def
ticket
(
self
):
...
...
apps/tickets/api/ticket/ticket.py
浏览文件 @
24b1c871
...
...
@@ -5,12 +5,13 @@ from rest_framework import viewsets
from
rest_framework.decorators
import
action
from
rest_framework.exceptions
import
MethodNotAllowed
from
common.const.http
import
POST
,
PUT
from
common.mixins.api
import
CommonApiMixin
from
common.permissions
import
IsValidUser
,
IsOrgAdmin
from
common.const.http
import
POST
,
PUT
from
tickets
import
serializers
,
const
from
tickets.permissions.ticket
import
IsAssignee
,
NotClosed
from
tickets
import
serializers
from
tickets.models
import
Ticket
from
tickets.permissions.ticket
import
IsAssignee
,
NotClosed
__all__
=
[
'TicketViewSet'
]
...
...
@@ -67,7 +68,6 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
def
get_dynamic_mapping_fields_mapping_rule
(
self
):
from
tickets.serializers.ticket.meta
import
get_meta_field_mapping_rule_by_view
meta_field_mapping_rule
=
get_meta_field_mapping_rule_by_view
(
self
)
fields_mapping_rule
=
{
return
{
'meta'
:
meta_field_mapping_rule
,
}
return
fields_mapping_rule
apps/tickets/migrations/0007_auto_20201224_1821.py
浏览文件 @
24b1c871
...
...
@@ -76,7 +76,12 @@ def migrate_tickets_fields_name(apps, schema_editor):
ticket
.
type
=
migrate_field_type
(
ticket
.
type
)
ticket
.
meta
=
migrate_field_meta
(
ticket
.
type
,
ticket
.
meta
)
ticket
.
meta
[
'body'
]
=
ticket
.
body
ticket
.
save
()
fields
=
[
'applicant'
,
'applicant_display'
,
'processor'
,
'processor_display'
,
'assignees_display_new'
,
'action'
,
'type'
,
'meta'
]
ticket_model
.
origin_objects
.
bulk_update
(
tickets
,
fields
)
class
Migration
(
migrations
.
Migration
):
...
...
apps/tickets/models/ticket/model.py
浏览文件 @
24b1c871
...
...
@@ -135,7 +135,7 @@ class Ticket(TicketModelMixin, CommonModelMixin, OrgModelMixin):
self
.
set_action_close
()
self
.
save
()
#
#
ticket
def
has_assignee
(
self
,
assignee
):
return
self
.
assignees
.
filter
(
id
=
assignee
.
id
).
exists
()
...
...
apps/tickets/permissions/ticket.py
浏览文件 @
24b1c871
...
...
@@ -9,5 +9,4 @@ class IsAssignee(permissions.BasePermission):
class
NotClosed
(
permissions
.
BasePermission
):
def
has_object_permission
(
self
,
request
,
view
,
obj
):
return
True
return
not
obj
.
status_closed
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录