NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #865: Fix server error when attempting to delete a protected object parent (Python 3)

Browse Source
This commit is contained in:
Jeremy Stretch 2017-02-01 12:09:59 -05:00
parent 9905099a71
commit d817990283
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/utilities/error_handlers.py
View File

@ -5,20 +5,19 @@ def handle_protectederror(obj, request, e):
""" """
Generate a user-friendly error message in response to a ProtectedError exception. Generate a user-friendly error message in response to a ProtectedError exception.
""" """
dependent_objects = e[1]
try: try:
dep_class = dependent_objects[0]._meta.verbose_name_plural dep_class = e.protected_objects[0]._meta.verbose_name_plural
except IndexError: except IndexError:
raise e raise e
# Grammar for single versus multiple triggering objects # Grammar for single versus multiple triggering objects
if type(obj) in (list, tuple): if type(obj) in (list, tuple):
err_message = "Unable to delete the requested {}. The following dependent {} were found: ".format( err_message = u"Unable to delete the requested {}. The following dependent {} were found: ".format(
obj[0]._meta.verbose_name_plural, obj[0]._meta.verbose_name_plural,
dep_class, dep_class,
) )
else: else:
err_message = "Unable to delete {} {}. The following dependent {} were found: ".format( err_message = u"Unable to delete {} {}. The following dependent {} were found: ".format(
obj._meta.verbose_name, obj._meta.verbose_name,
obj, obj,
dep_class, dep_class,
@ -26,11 +25,11 @@ def handle_protectederror(obj, request, e):
# Append dependent objects to error message # Append dependent objects to error message
dependent_objects = [] dependent_objects = []
for o in e[1]: for o in e.protected_objects:
if hasattr(o, 'get_absolute_url'): if hasattr(o, 'get_absolute_url'):
dependent_objects.append('<a href="{}">{}</a>'.format(o.get_absolute_url(), str(o))) dependent_objects.append(u'<a href="{}">{}</a>'.format(o.get_absolute_url(), o))
else: else:
dependent_objects.append(str(o)) dependent_objects.append(str(o))
err_message += ', '.join(dependent_objects) err_message += u', '.join(dependent_objects)
messages.error(request, err_message) messages.error(request, err_message)