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

feat: 工单支持审批时修改资产 (#8549)

Browse Source 
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
This commit is contained in:
fit2bot
2022-07-12 15:28:42 +08:00
committed by GitHub
parent b64727e04c
commit b5cfc6831b
16 changed files with 274 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/tickets/handlers/base.py
View File

@@ -1,11 +1,12 @@
from django.utils.translation import ugettext as _
from django.template.loader import render_to_string
from common.utils import get_logger
from tickets.utils import (
send_ticket_processed_mail_to_applicant,
send_ticket_applied_mail_to_assignees
)
from tickets.const import TicketState, TicketStatus
from tickets.const import TicketState, TicketType
logger = get_logger(__name__)
@@ -59,6 +60,25 @@ class BaseHandler:
logger.debug('Send processed mail to applicant: {}'.format(applicant))
send_ticket_processed_mail_to_applicant(self.ticket, processor)
def _diff_prev_approve_context(self, state):
diff_context = {}
if state != TicketState.approved:
return diff_context
if self.ticket.type not in [TicketType.apply_asset, TicketType.apply_application]:
return diff_context
old_rel_snapshot = self.ticket.old_rel_snapshot
current_rel_snapshot = self.ticket.get_local_snapshot()
diff = set(current_rel_snapshot.items()) - set(old_rel_snapshot.items())
if not diff:
return diff_context
content = []
for k, v in sorted(list(diff), reverse=True):
content.append([k, old_rel_snapshot[k], v])
headers = [_('Change field'), _('Before change'), _('After change')]
return {'headers': headers, 'content': content}
def _create_state_change_comment(self, state):
# 打开或关闭工单，备注显示是自己，其他是受理人
if state in [TicketState.reopen, TicketState.pending, TicketState.closed]:
@@ -68,8 +88,11 @@ class BaseHandler:
user_display = str(user)
state_display = getattr(TicketState, state).label
approve_info = _('{} {} the ticket').format(user_display, state_display)
context = self._diff_prev_approve_context(state)
context.update({'approve_info': approve_info})
data = {
'body': _('{} {} the ticket').format(user_display, state_display),
'body': render_to_string('tickets/ticket_approve_diff.html', context),
'user': user,
'user_display': str(user),
'type': 'state',