diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index 980de7672..83405a3c1 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -345,10 +345,9 @@ class ModelViewSet(_ModelViewSet): try: return super().dispatch(request, *args, **kwargs) except ProtectedError as e: - models = [ - '{} ({})'.format(o, o._meta) for o in e.protected_objects.all() - ] - msg = 'Unable to delete object. The following dependent objects were found: {}'.format(', '.join(models)) + protected_objects = list(e.protected_objects) + msg = f'Unable to delete object. {len(protected_objects)} dependent objects were found: ' + msg += ', '.join([f'{obj} ({obj.pk})' for obj in protected_objects]) logger.warning(msg) return self.finalize_response( request, diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py index da8510950..7f912dcb1 100644 --- a/netbox/utilities/error_handlers.py +++ b/netbox/utilities/error_handlers.py @@ -7,31 +7,17 @@ def handle_protectederror(obj, request, e): """ Generate a user-friendly error message in response to a ProtectedError exception. """ - try: - dep_class = e.protected_objects[0]._meta.verbose_name_plural - except IndexError: - raise e - - # Grammar for single versus multiple triggering objects - if type(obj) in (list, tuple): - err_message = "Unable to delete the requested {}. The following dependent {} were found: ".format( - obj[0]._meta.verbose_name_plural, - dep_class, - ) - else: - err_message = "Unable to delete {} {}. The following dependent {} were found: ".format( - obj._meta.verbose_name, - obj, - dep_class, - ) + 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: " # Append dependent objects to error message dependent_objects = [] - for obj in e.protected_objects: + for dependent in protected_objects: if hasattr(obj, 'get_absolute_url'): - dependent_objects.append('{}'.format(obj.get_absolute_url(), escape(obj))) + dependent_objects.append(f'{escape(dependent)}') else: - dependent_objects.append(str(obj)) + dependent_objects.append(str(dependent)) err_message += ', '.join(dependent_objects) messages.error(request, mark_safe(err_message))