From 1f7ef15ad168e9d68bbdf711b015e9f0c4e83abb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 May 2017 11:43:11 -0400 Subject: [PATCH] Fixes #1116: Correct object links on recursive deletion error --- netbox/utilities/error_handlers.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py index 1691b41cd..e87b6f0e1 100644 --- a/netbox/utilities/error_handlers.py +++ b/netbox/utilities/error_handlers.py @@ -1,4 +1,6 @@ from django.contrib import messages +from django.utils.html import escape +from django.utils.safestring import mark_safe def handle_protectederror(obj, request, e): @@ -25,11 +27,11 @@ def handle_protectederror(obj, request, e): # Append dependent objects to error message dependent_objects = [] - for o in e.protected_objects: - if hasattr(o, 'get_absolute_url'): - dependent_objects.append(u'{}'.format(o.get_absolute_url(), o)) + for obj in e.protected_objects: + if hasattr(obj, 'get_absolute_url'): + dependent_objects.append(u'{}'.format(obj.get_absolute_url(), escape(obj))) else: - dependent_objects.append(str(o)) + dependent_objects.append(str(obj)) err_message += u', '.join(dependent_objects) - messages.error(request, err_message) + messages.error(request, mark_safe(err_message))