Просмотр исходного кода

Fixes #5020: Correct handling of dependent objects during bulk deletion

Jeremy Stretch 5 лет назад
Родитель
Сommit
bf4fee1592
3 измененных файлов с 9 добавлено и 7 удалено
  1. 1 0
      docs/release-notes/version-2.9.md
  2. 6 5
      netbox/utilities/error_handlers.py
  3. 2 2
      netbox/utilities/views.py

+ 1 - 0
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
 * [#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
 * [#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
 
 
 ---
 ---
 
 

+ 6 - 5
netbox/utilities/error_handlers.py

@@ -3,18 +3,19 @@ from django.utils.html import escape
 from django.utils.safestring import mark_safe
 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.
     Generate a user-friendly error message in response to a ProtectedError exception.
     """
     """
     protected_objects = list(e.protected_objects)
     protected_objects = list(e.protected_objects)
-    err_message = f"Unable to delete {obj._meta.verbose_name} <strong>{obj}</strong>. " \
-                  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 <strong>{', '.join(str(obj) for obj in obj_list)}</strong>. " \
+                  f"{protected_count} dependent objects were found: "
 
 
     # Append dependent objects to error message
     # Append dependent objects to error message
     dependent_objects = []
     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'<a href="{dependent.get_absolute_url()}">{escape(dependent)}</a>')
             dependent_objects.append(f'<a href="{dependent.get_absolute_url()}">{escape(dependent)}</a>')
         else:
         else:
             dependent_objects.append(str(dependent))
             dependent_objects.append(str(dependent))

+ 2 - 2
netbox/utilities/views.py

@@ -509,7 +509,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 obj.delete()
                 obj.delete()
             except ProtectedError as e:
             except ProtectedError as e:
                 logger.info("Caught ProtectedError while attempting to delete object")
                 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())
                 return redirect(obj.get_absolute_url())
 
 
             msg = 'Deleted {} {}'.format(self.queryset.model._meta.verbose_name, obj)
             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]
                     deleted_count = queryset.delete()[1][model._meta.label]
                 except ProtectedError as e:
                 except ProtectedError as e:
                     logger.info("Caught ProtectedError while attempting to delete objects")
                     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))
                     return redirect(self.get_return_url(request))
 
 
                 msg = 'Deleted {} {}'.format(deleted_count, model._meta.verbose_name_plural)
                 msg = 'Deleted {} {}'.format(deleted_count, model._meta.verbose_name_plural)