From bf4fee159292c49dd78ce772e3256e272d07540f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 20 Aug 2020 09:44:45 -0400 Subject: [PATCH] Fixes #5020: Correct handling of dependent objects during bulk deletion --- docs/release-notes/version-2.9.md | 1 + netbox/utilities/error_handlers.py | 11 ++++++----- netbox/utilities/views.py | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index b53aaed4a..596956f9f 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -6,6 +6,7 @@ * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution * [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member +* [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion --- diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py index 7f912dcb1..1d3bdbafd 100644 --- a/netbox/utilities/error_handlers.py +++ b/netbox/utilities/error_handlers.py @@ -3,18 +3,19 @@ from django.utils.html import escape from django.utils.safestring import mark_safe -def handle_protectederror(obj, request, e): +def handle_protectederror(obj_list, request, e): """ Generate a user-friendly error message in response to a ProtectedError exception. """ protected_objects = list(e.protected_objects) - err_message = f"Unable to delete {obj._meta.verbose_name} {obj}. " \ - f"{len(protected_objects)} dependent objects were found: " + protected_count = len(protected_objects) if len(protected_objects) <= 50 else 'More than 50' + err_message = f"Unable to delete {', '.join(str(obj) for obj in obj_list)}. " \ + f"{protected_count} dependent objects were found: " # Append dependent objects to error message dependent_objects = [] - for dependent in protected_objects: - if hasattr(obj, 'get_absolute_url'): + for dependent in protected_objects[:50]: + if hasattr(dependent, 'get_absolute_url'): dependent_objects.append(f'{escape(dependent)}') else: dependent_objects.append(str(dependent)) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index a13a47df8..c7db2f649 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -509,7 +509,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): obj.delete() except ProtectedError as e: logger.info("Caught ProtectedError while attempting to delete object") - handle_protectederror(obj, request, e) + handle_protectederror([obj], request, e) return redirect(obj.get_absolute_url()) msg = 'Deleted {} {}'.format(self.queryset.model._meta.verbose_name, obj) @@ -1164,7 +1164,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): deleted_count = queryset.delete()[1][model._meta.label] except ProtectedError as e: logger.info("Caught ProtectedError while attempting to delete objects") - handle_protectederror(list(queryset), request, e) + handle_protectederror(queryset, request, e) return redirect(self.get_return_url(request)) msg = 'Deleted {} {}'.format(deleted_count, model._meta.verbose_name_plural)