NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Clean up usages of mark_safe()

Browse Source
This commit is contained in:
jeremystretch 2022-08-08 10:47:07 -04:00
parent 135543683d
commit 90317adae7
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/dcim/views.py
View File

@ -3083,7 +3083,7 @@ class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMix
if membership_form.is_valid(): if membership_form.is_valid():
membership_form.save() membership_form.save()
msg = 'Added member <a href="{}">{}</a>'.format(device.get_absolute_url(), escape(device)) msg = f'Added member <a href="{device.get_absolute_url()}">{escape(device)}</a>'
messages.success(request, mark_safe(msg)) messages.success(request, mark_safe(msg))
if '_addanother' in request.POST: if '_addanother' in request.POST:
@ -3128,8 +3128,7 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL
# Protect master device from being removed # Protect master device from being removed
virtual_chassis = VirtualChassis.objects.filter(master=device).first() virtual_chassis = VirtualChassis.objects.filter(master=device).first()
if virtual_chassis is not None: if virtual_chassis is not None:
msg = 'Unable to remove master device {} from the virtual chassis.'.format(escape(device)) messages.error(request, f'Unable to remove master device {device} from the virtual chassis.')
messages.error(request, mark_safe(msg))
return redirect(device.get_absolute_url()) return redirect(device.get_absolute_url())
if form.is_valid(): if form.is_valid():

6
netbox/netbox/views/generic/object_views.py
View File

@ -386,10 +386,10 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
) )
logger.info(f"{msg} {obj} (PK: {obj.pk})") logger.info(f"{msg} {obj} (PK: {obj.pk})")
if hasattr(obj, 'get_absolute_url'): if hasattr(obj, 'get_absolute_url'):
msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), escape(obj)) msg = mark_safe(f'{msg} <a href="{obj.get_absolute_url()}">{escape(obj)}</a>')
else: else:
msg = '{} {}'.format(msg, escape(obj)) msg = f'{msg} {obj}'
messages.success(request, mark_safe(msg)) messages.success(request, msg)
if '_addanother' in request.POST: if '_addanother' in request.POST:
redirect_url = request.path redirect_url = request.path

4
netbox/utilities/templatetags/builtins/filters.py
View File

@ -86,8 +86,8 @@ def placeholder(value):
""" """
if value not in ('', None): if value not in ('', None):
return value return value
placeholder = '<span class="text-muted">&mdash;</span>'
return mark_safe(placeholder) return mark_safe('<span class="text-muted">&mdash;</span>')
@register.filter() @register.filter()

4
netbox/utilities/templatetags/helpers.py
View File

@ -109,9 +109,7 @@ def annotated_date(date_value):
long_ts = date(date_value, 'DATETIME_FORMAT') long_ts = date(date_value, 'DATETIME_FORMAT')
short_ts = date(date_value, 'SHORT_DATETIME_FORMAT') short_ts = date(date_value, 'SHORT_DATETIME_FORMAT')
span = f'<span title="{long_ts}">{short_ts}</span>' return mark_safe(f'<span title="{long_ts}">{short_ts}</span>')
return mark_safe(span)
@register.simple_tag @register.simple_tag