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

11
apps/tickets/notifications.py
View File

@@ -4,7 +4,6 @@ import json
from django.conf import settings
from django.core.cache import cache
from django.shortcuts import reverse
from django.db.models.fields import related
from django.template.loader import render_to_string
from django.forms import model_to_dict
from django.utils.translation import ugettext_lazy as _
@@ -75,13 +74,7 @@ class BaseTicketMessage(UserMessage):
for name in item_names:
field = fields[name]
item = {'name': name, 'title': field.verbose_name}
value = data.get(name)
if hasattr(self.ticket, f'get_{name}_display'):
value = getattr(self.ticket, f'get_{name}_display')()
elif isinstance(field, related.ForeignKey):
value = self.ticket.rel_snapshot[name]
elif isinstance(field, related.ManyToManyField):
value = ', '.join(self.ticket.rel_snapshot[name])
value = self.ticket.get_field_display(name, field, data)
item['value'] = value
items.append(item)
return items
@@ -113,7 +106,7 @@ class TicketAppliedToAssigneeMessage(BaseTicketMessage):
@property
def content_title(self):
return _('Your has a new ticket')
return _('Your has a new ticket, applicant - {}').format(self.ticket.applicant)
@property
def subject(self):