mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-16 09:02:49 +00:00
Compare commits
3 Commits
revert-162
...
v2.27
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
305935967e | ||
|
|
782efc5f54 | ||
|
|
7aec5336d3 |
@@ -10,8 +10,8 @@ __all__ = ['MailTestSerializer', 'EmailSettingSerializer', 'EmailContentSettingS
|
|||||||
|
|
||||||
|
|
||||||
class MailTestSerializer(serializers.Serializer):
|
class MailTestSerializer(serializers.Serializer):
|
||||||
EMAIL_FROM = serializers.CharField(required=False, allow_blank=True)
|
EMAIL_FROM = serializers.CharField(required=False, allow_null=True, allow_blank=True)
|
||||||
EMAIL_RECIPIENT = serializers.CharField(required=False, allow_blank=True)
|
EMAIL_RECIPIENT = serializers.CharField(required=False, allow_null=True, allow_blank=True)
|
||||||
|
|
||||||
|
|
||||||
class EmailSettingSerializer(serializers.Serializer):
|
class EmailSettingSerializer(serializers.Serializer):
|
||||||
|
|||||||
@@ -51,22 +51,23 @@ class DBPortManager(object):
|
|||||||
|
|
||||||
def pop(self, db: Application):
|
def pop(self, db: Application):
|
||||||
mapper = self.get_mapper()
|
mapper = self.get_mapper()
|
||||||
to_delete_port = self.get_port_by_db(db)
|
to_delete_port = self.get_port_by_db(db, raise_exception=False)
|
||||||
mapper.pop(to_delete_port, None)
|
mapper.pop(to_delete_port, None)
|
||||||
self.set_mapper(mapper)
|
self.set_mapper(mapper)
|
||||||
|
|
||||||
def get_port_by_db(self, db):
|
def get_port_by_db(self, db, raise_exception=True):
|
||||||
mapper = self.get_mapper()
|
mapper = self.get_mapper()
|
||||||
for port, db_id in mapper.items():
|
for port, db_id in mapper.items():
|
||||||
if db_id == str(db.id):
|
if db_id == str(db.id):
|
||||||
return port
|
return port
|
||||||
error = _(
|
if raise_exception:
|
||||||
'No available port is matched. '
|
error = _(
|
||||||
'The number of databases may have exceeded the number of ports '
|
'No available port is matched. '
|
||||||
'open to the database agent service, '
|
'The number of databases may have exceeded the number of ports '
|
||||||
'Contact the administrator to open more ports.'
|
'open to the database agent service, '
|
||||||
)
|
'Contact the administrator to open more ports.'
|
||||||
raise JMSException(error)
|
)
|
||||||
|
raise JMSException(error)
|
||||||
|
|
||||||
def get_db_by_port(self, port):
|
def get_db_by_port(self, port):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
from html import escape
|
||||||
|
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import ugettext as _
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
|
|
||||||
@@ -96,11 +98,19 @@ class BaseHandler:
|
|||||||
approve_info = _('{} {} the ticket').format(user_display, state_display)
|
approve_info = _('{} {} the ticket').format(user_display, state_display)
|
||||||
context = self._diff_prev_approve_context(state)
|
context = self._diff_prev_approve_context(state)
|
||||||
context.update({'approve_info': approve_info})
|
context.update({'approve_info': approve_info})
|
||||||
|
body = self.reject_html_script(
|
||||||
|
render_to_string('tickets/ticket_approve_diff.html', context)
|
||||||
|
)
|
||||||
data = {
|
data = {
|
||||||
'body': render_to_string('tickets/ticket_approve_diff.html', context),
|
'body': body,
|
||||||
'user': user,
|
'user': user,
|
||||||
'user_display': str(user),
|
'user_display': str(user),
|
||||||
'type': 'state',
|
'type': 'state',
|
||||||
'state': state
|
'state': state
|
||||||
}
|
}
|
||||||
return self.ticket.comments.create(**data)
|
return self.ticket.comments.create(**data)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def reject_html_script(unsafe_html):
|
||||||
|
safe_html = escape(unsafe_html)
|
||||||
|
return safe_html
|
||||||
|
|||||||
Reference in New Issue
Block a user