github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 11:28:38 +00:00
Code Issues Projects Releases Wiki Activity

perf: 工单优化(审批人可以填写工单对应的授权规则名称) (#5468)

Browse Source 
* perf: 工单优化(审批人可以填写工单对应的授权规则名称)

* perf: 工单优化(优化推荐的资产、应用、系统用户等逻辑)

* perf: 工单优化(优化工单邮件内容)

* perf: MethodSerializer优化(优化当Serializer不需要时, 默认可以不传递对应字段)

Co-authored-by: Bai <bugatti_it@163.com>
This commit is contained in:
fit2bot
2021-01-19 15:44:19 +08:00
committed by GitHub
parent 0842553f8a
commit 9126c7780d
11 changed files with 214 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/tickets/handler/apply_asset.py
View File

@@ -90,13 +90,14 @@ class Handler(BaseHandler):
if asset_permission:
return asset_permission
approve_permission_name = self.ticket.meta.get('approve_permission_name', )
approve_assets_id = self.ticket.meta.get('approve_assets', [])
approve_system_users_id = self.ticket.meta.get('approve_system_users', [])
approve_actions = self.ticket.meta.get('approve_actions', Action.NONE)
approve_date_start = self.ticket.meta.get('approve_date_start')
approve_date_expired = self.ticket.meta.get('approve_date_expired')
permission_name = _('Created by ticket ({}) ({})'.format(
self.ticket.title, str(self.ticket.id)[:4])
permission_created_by = '{}:{}'.format(
str(self.ticket.__class__.__name__), str(self.ticket.id)
)
permission_comment = _(
'Created by the ticket, '
@@ -104,18 +105,18 @@ class Handler(BaseHandler):
'ticket applicant: {}, '
'ticket processor: {}, '
'ticket ID: {}'
''.format(
self.ticket.title,
self.ticket.applicant_display,
self.ticket.processor_display,
str(self.ticket.id)
)
).format(
self.ticket.title,
self.ticket.applicant_display,
self.ticket.processor_display,
str(self.ticket.id)
)
permission_data = {
'id': self.ticket.id,
'name': str(permission_name),
'comment': permission_comment,
'created_by': '{}:{}'.format(str(self.__class__.__name__), str(self.ticket.id)),
'name': approve_permission_name,
'comment': str(permission_comment),
'created_by': permission_created_by,
'actions': approve_actions,
'date_start': approve_date_start,
'date_expired': approve_date_expired,