mirror of https://github.com/jumpserver/jumpserver
parent
56d533c802
commit
6a9f1978bb
|
@ -1,4 +1,4 @@
|
|||
from html import escape
|
||||
import html2text
|
||||
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.template.loader import render_to_string
|
||||
|
@ -67,7 +67,7 @@ class BaseHandler:
|
|||
if state != TicketState.approved:
|
||||
return diff_context
|
||||
|
||||
if self.ticket.type == TicketType.apply_asset:
|
||||
if self.ticket.type != TicketType.apply_asset:
|
||||
return diff_context
|
||||
|
||||
# 企业微信,钉钉审批不做diff
|
||||
|
@ -112,5 +112,4 @@ class BaseHandler:
|
|||
|
||||
@staticmethod
|
||||
def safe_html_script(unsafe_html):
|
||||
safe_html = escape(unsafe_html)
|
||||
return safe_html
|
||||
return html2text.html2text(unsafe_html)
|
||||
|
|
|
@ -399,7 +399,10 @@ class Ticket(StatusMixin, JMSBaseModel):
|
|||
elif isinstance(field, related.ForeignKey):
|
||||
value = self.rel_snapshot[name]
|
||||
elif isinstance(field, related.ManyToManyField):
|
||||
value = ', '.join(self.rel_snapshot[name])
|
||||
if isinstance(self.rel_snapshot[name], str):
|
||||
value = self.rel_snapshot[name]
|
||||
elif isinstance(self.rel_snapshot[name], list):
|
||||
value = ','.join(self.rel_snapshot[name])
|
||||
elif isinstance(value, list):
|
||||
value = ', '.join(value)
|
||||
return value
|
||||
|
|
Loading…
Reference in New Issue