{stacktrace}")
logger.error(f"Exception raised during report execution: {e}")
- job.terminate(status=JobStatusChoices.STATUS_ERRORED)
+ job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
# Perform any post-run tasks
self.post_run()
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index af6c93b5d..f8f0a6d9a 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -519,7 +519,7 @@ def run_script(data, request, job, commit=True, **kwargs):
logger.error(f"Exception raised during script execution: {e}")
script.log_info("Database changes have been reverted due to error.")
job.data = ScriptOutputSerializer(script).data
- job.terminate(status=JobStatusChoices.STATUS_ERRORED)
+ job.terminate(status=JobStatusChoices.STATUS_ERRORED, error=str(e))
clear_webhooks.send(request)
logger.info(f"Script completed in {job.duration}")
diff --git a/netbox/extras/utils.py b/netbox/extras/utils.py
index 23892e098..7b9356efb 100644
--- a/netbox/extras/utils.py
+++ b/netbox/extras/utils.py
@@ -67,6 +67,10 @@ def register_features(model, features):
f"{feature} is not a valid model feature! Valid keys are: {registry['model_features'].keys()}"
)
+ # Register public models
+ if not getattr(model, '_netbox_private', False):
+ registry['models'][app_label].add(model_name)
+
def is_script(obj):
"""
diff --git a/netbox/netbox/api/viewsets/__init__.py b/netbox/netbox/api/viewsets/__init__.py
index c6794bb61..522bcf77b 100644
--- a/netbox/netbox/api/viewsets/__init__.py
+++ b/netbox/netbox/api/viewsets/__init__.py
@@ -2,7 +2,7 @@ import logging
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
from django.db import transaction
-from django.db.models import ProtectedError
+from django.db.models import ProtectedError, RestrictedError
from django_pglocks import advisory_lock
from netbox.constants import ADVISORY_LOCK_KEYS
from rest_framework import mixins as drf_mixins
@@ -91,8 +91,11 @@ class NetBoxModelViewSet(
try:
return super().dispatch(request, *args, **kwargs)
- except ProtectedError as e:
- protected_objects = list(e.protected_objects)
+ except (ProtectedError, RestrictedError) as e:
+ if type(e) is ProtectedError:
+ protected_objects = list(e.protected_objects)
+ else:
+ protected_objects = list(e.restricted_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)
diff --git a/netbox/netbox/api/viewsets/mixins.py b/netbox/netbox/api/viewsets/mixins.py
index fde486fe9..7b6c00843 100644
--- a/netbox/netbox/api/viewsets/mixins.py
+++ b/netbox/netbox/api/viewsets/mixins.py
@@ -137,11 +137,14 @@ class BulkUpdateModelMixin:
}
]
"""
+ def get_bulk_update_queryset(self):
+ return self.get_queryset()
+
def bulk_update(self, request, *args, **kwargs):
partial = kwargs.pop('partial', False)
serializer = BulkOperationSerializer(data=request.data, many=True)
serializer.is_valid(raise_exception=True)
- qs = self.get_queryset().filter(
+ qs = self.get_bulk_update_queryset().filter(
pk__in=[o['id'] for o in serializer.data]
)
@@ -184,10 +187,13 @@ class BulkDestroyModelMixin:
{"id": 456}
]
"""
+ def get_bulk_destroy_queryset(self):
+ return self.get_queryset()
+
def bulk_destroy(self, request, *args, **kwargs):
serializer = BulkOperationSerializer(data=request.data, many=True)
serializer.is_valid(raise_exception=True)
- qs = self.get_queryset().filter(
+ qs = self.get_bulk_destroy_queryset().filter(
pk__in=[o['id'] for o in serializer.data]
)
diff --git a/netbox/netbox/registry.py b/netbox/netbox/registry.py
index 21a869001..151eb2f6b 100644
--- a/netbox/netbox/registry.py
+++ b/netbox/netbox/registry.py
@@ -25,6 +25,7 @@ registry = Registry({
'data_backends': dict(),
'denormalized_fields': collections.defaultdict(list),
'model_features': dict(),
+ 'models': collections.defaultdict(set),
'plugins': dict(),
'search': dict(),
'views': collections.defaultdict(dict),
diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index 676e3f5af..fbe3aa2ba 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -7,7 +7,7 @@ from django.contrib.contenttypes.fields import GenericRel
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist, ValidationError
from django.db import transaction, IntegrityError
-from django.db.models import ManyToManyField, ProtectedError
+from django.db.models import ManyToManyField, ProtectedError, RestrictedError
from django.db.models.fields.reverse_related import ManyToManyRel
from django.forms import HiddenInput, ModelMultipleChoiceField, MultipleHiddenInput
from django.http import HttpResponse
@@ -798,14 +798,15 @@ class BulkDeleteView(GetReturnURLMixin, BaseMultiObjectView):
queryset = self.queryset.filter(pk__in=pk_list)
deleted_count = queryset.count()
try:
- for obj in queryset:
- # Take a snapshot of change-logged models
- if hasattr(obj, 'snapshot'):
- obj.snapshot()
- obj.delete()
+ with transaction.atomic():
+ for obj in queryset:
+ # Take a snapshot of change-logged models
+ if hasattr(obj, 'snapshot'):
+ obj.snapshot()
+ obj.delete()
- except ProtectedError as e:
- logger.info("Caught ProtectedError while attempting to delete objects")
+ except (ProtectedError, RestrictedError) as e:
+ logger.info(f"Caught {type(e)} while attempting to delete objects")
handle_protectederror(queryset, request, e)
return redirect(self.get_return_url(request))
diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 99d8ff540..99508c9e3 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -1,9 +1,11 @@
import logging
+from collections import defaultdict
from copy import deepcopy
from django.contrib import messages
-from django.db import transaction
-from django.db.models import ProtectedError
+from django.db import router, transaction
+from django.db.models import ProtectedError, RestrictedError
+from django.db.models.deletion import Collector
from django.shortcuts import redirect, render
from django.urls import reverse
from django.utils.html import escape
@@ -320,6 +322,27 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
def get_required_permission(self):
return get_permission_for_model(self.queryset.model, 'delete')
+ def _get_dependent_objects(self, obj):
+ """
+ Returns a dictionary mapping of dependent objects (organized by model) which will be deleted as a result of
+ deleting the requested object.
+
+ Args:
+ obj: The object to return dependent objects for
+ """
+ using = router.db_for_write(obj._meta.model)
+ collector = Collector(using=using)
+ collector.collect([obj])
+
+ # Compile a mapping of models to instances
+ dependent_objects = defaultdict(list)
+ for model, instance in collector.instances_with_model():
+ # Omit the root object
+ if instance != obj:
+ dependent_objects[model].append(instance)
+
+ return dict(dependent_objects)
+
#
# Request handlers
#
@@ -333,6 +356,7 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
"""
obj = self.get_object(**kwargs)
form = ConfirmationForm(initial=request.GET)
+ dependent_objects = self._get_dependent_objects(obj)
# If this is an HTMX request, return only the rendered deletion form as modal content
if is_htmx(request):
@@ -343,6 +367,7 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
'object_type': self.queryset.model._meta.verbose_name,
'form': form,
'form_url': form_url,
+ 'dependent_objects': dependent_objects,
**self.get_extra_context(request, obj),
})
@@ -350,6 +375,7 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
'object': obj,
'form': form,
'return_url': self.get_return_url(request, obj),
+ 'dependent_objects': dependent_objects,
**self.get_extra_context(request, obj),
})
@@ -374,8 +400,8 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
try:
obj.delete()
- except ProtectedError as e:
- logger.info("Caught ProtectedError while attempting to delete object")
+ except (ProtectedError, RestrictedError) as e:
+ logger.info(f"Caught {type(e)} while attempting to delete objects")
handle_protectederror([obj], request, e)
return redirect(obj.get_absolute_url())
diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index 1fe3862cd..deb651739 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -35,6 +35,12 @@
+ {% trans "The following objects will be deleted as a result of this action." %} +
+