nautobot 3.0.3__py3-none-any.whl → 3.0.5__py3-none-any.whl

nautobot/core/tests/test_templatetags_helpers.py

@@ -48,23 +48,23 @@ class NautobotTemplatetagsHelperTest(TestCase):
         self.assertEqual(
             helpers.hyperlinked_email("admin@example.com"), '<a href="mailto:admin@example.com">admin@example.com</a>'
         )
-        self.assertEqual(helpers.hyperlinked_email(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_email(None), helpers.HTML_NONE)
 
     def test_hyperlinked_phone_number(self):
         self.assertEqual(helpers.hyperlinked_phone_number("555-1234"), '<a href="tel:555-1234">555-1234</a>')
-        self.assertEqual(helpers.hyperlinked_phone_number(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_phone_number(None), helpers.HTML_NONE)
 
     def test_placeholder(self):
-        self.assertEqual(helpers.placeholder(None), '<span class="text-secondary">&mdash;</span>')
-        self.assertEqual(helpers.placeholder([]), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.placeholder(None), helpers.HTML_NONE)
+        self.assertEqual(helpers.placeholder([]), helpers.HTML_NONE)
         self.assertEqual(helpers.placeholder("something"), "something")
 
     def test_pre_tag(self):
-        self.assertEqual(helpers.pre_tag(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.pre_tag(None), helpers.HTML_NONE)
         self.assertEqual(helpers.pre_tag([]), "<pre>[]</pre>")
         self.assertEqual(helpers.pre_tag("something"), "<pre>something</pre>")
-        self.assertEqual(helpers.pre_tag("", format_empty_value=False), '<span class="text-secondary">&mdash;</span>')
-        self.assertEqual(helpers.pre_tag([], format_empty_value=False), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.pre_tag("", format_empty_value=False), helpers.HTML_NONE)
+        self.assertEqual(helpers.pre_tag([], format_empty_value=False), helpers.HTML_NONE)
         self.assertEqual(helpers.pre_tag("something", format_empty_value=False), "<pre>something</pre>")
 
     def test_add_html_id(self):
@@ -263,7 +263,7 @@ class NautobotTemplatetagsHelperTest(TestCase):
                 helpers.render_boolean(value),
                 '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>',
             )
-        self.assertEqual(helpers.render_boolean(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.render_boolean(None), helpers.HTML_NONE)
 
     def test_hyperlinked_object_with_color(self):
         vlan_with_role = VLAN.objects.filter(role__isnull=False).first()
@@ -276,7 +276,7 @@ class NautobotTemplatetagsHelperTest(TestCase):
             f'<span class="badge" style="color: {fbcolor}; background-color: #{color}">{display}</span>',
         )
         # Assert when obj is None
-        self.assertEqual(helpers.hyperlinked_object_with_color(obj=None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_object_with_color(obj=None), helpers.HTML_NONE)
 
     @tag("example_app")
     @override_settings(BANNER_TOP="¡Hola, mundo!")

nautobot/core/ui/object_detail.py

@@ -1917,6 +1917,7 @@ class _ObjectCustomFieldsPanel(GroupedKeyValueTablePanel):
 
     def render_value(self, key, value, context: Context):
         """Render a given custom field value appropriately depending on what type of custom field it is."""
+        # TODO: this logic could be unified with CustomFieldColumn.render()?
         cf = key
         if cf.type == CustomFieldTypeChoices.TYPE_BOOLEAN:
             return render_boolean(value)

nautobot/dcim/forms.py

@@ -4516,6 +4516,7 @@ class CableFilterForm(BootstrapMixin, StatusModelFilterFormMixin, forms.Form):
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())  # RGB color code
     device = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
+        to_field_name="name",
         required=False,
         label="Device",
         query_params={

nautobot/dcim/tables/devices.py

@@ -11,7 +11,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
-from nautobot.core.templatetags.helpers import humanize_speed
+from nautobot.core.templatetags.helpers import HTML_NONE, humanize_speed
 from nautobot.dcim.models import (
     ConsolePort,
     ConsoleServerPort,
@@ -204,7 +204,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     vc_priority = tables.Column(verbose_name="VC Priority")
     device_redundancy_group = tables.Column(linkify=True)
     device_redundancy_group_priority = tables.TemplateColumn(
-        template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}—{% endif %}"""
+        template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}<span class="text-secondary">—</span>{% endif %}"""
     )
     controller_managed_device_group = tables.Column(linkify=True, verbose_name="Device Group")
     software_version = tables.Column(linkify=True, verbose_name="Software Version")
@@ -263,7 +263,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("&mdash;")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 
@@ -1260,6 +1260,7 @@ class DeviceRedundancyGroupTable(BaseTable):
         fields = (
             "pk",
             "name",
+            "description",
             "status",
             "failover_strategy",
             "controller_count",
@@ -1504,7 +1505,7 @@ class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("&mdash;")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 
@@ -1568,7 +1569,7 @@ class ControllerManagedDeviceGroupTable(BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("&mdash;")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 

nautobot/dcim/tables/template_code.py

@@ -4,7 +4,7 @@ CABLETERMINATION = """
     <i class="mdi mdi-chevron-right"></i>
     <a href="{{ value.get_absolute_url }}">{{ value }}</a>
 {% else %}
-    &mdash;
+    <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 
@@ -26,12 +26,16 @@ PATHENDPOINT = """
         {% endfor %}
     {% endwith %}
 {% else %}
-    &mdash;
+    <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 
 CABLE_LENGTH = """
-{% if record.length %}{{ record.length }} {{ record.get_length_unit_display }}{% else %}&mdash;{% endif %}
+{% if record.length %}
+    {{ record.length }} {{ record.get_length_unit_display }}
+{% else %}
+    <span class="text-secondary">&mdash;</span>
+{% endif %}
 """
 
 CABLE_TERMINATION_PARENT = """
@@ -83,7 +87,7 @@ INTERFACE_TAGGED_VLANS = """
 {% elif record.mode == 'tagged-all' %}
   All
 {% else %}
-  &mdash;
+  <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 

nautobot/dcim/templates/dcim/platform_create.html

@@ -6,12 +6,11 @@
 
 {% block form_fields %}
     {% render_field form.name %}
-    {% render_field form.slug %}
     {% render_field form.manufacturer %}
 
-    <div class="mb-10 d-flex justify-content-center{% if form.network_driver.errors %} has-error{% endif %}">
-        <label class="col-lg-3 col-form-label" for="id_network_driver">Network driver</label>
-        <div class="col-lg-9">
+    <div class="mb-10 d-md-flex justify-content-center{% if form.network_driver.errors %} has-error{% endif %}">
+        <label class="col-md-3 col-form-label" for="id_network_driver">Network driver</label>
+        <div class="col-md-9">
             {{ form.network_driver }}
             <span class="form-text">
                 The <a href="https://netutils.readthedocs.io/en/latest/user/lib_use_cases_lib_mapper/">normalized network driver</a> to use when interacting with devices

nautobot/dcim/tests/test_tables.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 
+from nautobot.core.templatetags import helpers
 from nautobot.dcim.choices import InterfaceDuplexChoices, InterfaceSpeedChoices, InterfaceTypeChoices
 from nautobot.dcim.models import Device, DeviceType, Interface, InterfaceTemplate, Location, LocationType, Manufacturer
 from nautobot.dcim.tables.devices import DeviceModuleInterfaceTable, InterfaceTable
@@ -52,7 +53,6 @@ class InterfaceTableRenderMixin:
 
     def test_render_speed_duplex_with_none(self):
         """Test that the table handles None speed value and renders an emdash."""
-        emdash = "\u2014"
         interface = Interface.objects.create(
             device=self.device,
             name="eth1",
@@ -67,8 +67,8 @@ class InterfaceTableRenderMixin:
         rendered_speed = bound_row.get_cell("speed")
         rendered_duplex = bound_row.get_cell("duplex")
 
-        self.assertEqual(rendered_speed, emdash)
-        self.assertEqual(rendered_duplex, emdash)
+        self.assertEqual(rendered_speed, helpers.HTML_NONE)
+        self.assertEqual(rendered_duplex, helpers.HTML_NONE)
 
     def test_render_speed_various(self):
         """Test that the table correctly humanizes various speed values."""
@@ -146,7 +146,6 @@ class InterfaceTemplateTableTestCase(TestCase):
         self.assertEqual(rendered_duplex, "Full")
 
     def test_render_speed_duplex_with_none(self):
-        emdash = "\u2014"
         interface_template = InterfaceTemplate.objects.create(
             device_type=self.device_type,
             name="tmpl-eth1",
@@ -156,5 +155,5 @@ class InterfaceTemplateTableTestCase(TestCase):
         bound_row = table.rows[0]
         rendered_speed = bound_row.get_cell("speed")  # pylint: disable=no-member
         rendered_duplex = bound_row.get_cell("duplex")  # pylint: disable=no-member
-        self.assertEqual(rendered_speed, emdash)
-        self.assertEqual(rendered_duplex, emdash)
+        self.assertEqual(rendered_speed, helpers.HTML_NONE)
+        self.assertEqual(rendered_duplex, helpers.HTML_NONE)

nautobot/dcim/views.py

@@ -35,7 +35,6 @@ from nautobot.core.exceptions import AbortTransaction
 from nautobot.core.forms import BulkRenameForm, ConfirmationForm, ImportForm, restrict_form_fields
 from nautobot.core.models.querysets import count_related
 from nautobot.core.templatetags import helpers
-from nautobot.core.templatetags.helpers import bettertitle, has_perms
 from nautobot.core.ui import object_detail
 from nautobot.core.ui.breadcrumbs import (
     AncestorsInstanceBreadcrumbItem,
@@ -559,14 +558,14 @@ class MigrateLocationDataToContactView(generic.ObjectEditView):
         migrate_action = request.POST.get("action")
         try:
             with transaction.atomic():
-                if not has_perms(request.user, ["extras.add_contactassociation"]):
+                if not helpers.has_perms(request.user, ["extras.add_contactassociation"]):
                     raise PermissionDenied(
                         "ObjectPermission extras.add_contactassociation is needed to perform this action"
                     )
                 contact = None
                 team = None
                 if migrate_action == LocationDataToContactActionChoices.CREATE_AND_ASSIGN_NEW_CONTACT:
-                    if not has_perms(request.user, ["extras.add_contact"]):
+                    if not helpers.has_perms(request.user, ["extras.add_contact"]):
                         raise PermissionDenied("ObjectPermission extras.add_contact is needed to perform this action")
                     contact = Contact(
                         name=request.POST.get("name"),
@@ -577,7 +576,7 @@ class MigrateLocationDataToContactView(generic.ObjectEditView):
                     # Trigger permission check
                     Contact.objects.restrict(request.user, "view").get(pk=contact.pk)
                 elif migrate_action == LocationDataToContactActionChoices.CREATE_AND_ASSIGN_NEW_TEAM:
-                    if not has_perms(request.user, ["extras.add_team"]):
+                    if not helpers.has_perms(request.user, ["extras.add_team"]):
                         raise PermissionDenied("ObjectPermission extras.add_team is needed to perform this action")
                     team = Team(
                         name=request.POST.get("name"),
@@ -958,7 +957,7 @@ class DeviceTypeFieldsPanel(object_detail.ObjectFieldsPanel):
                     image.url,
                     image.name,
                 )
-            return format_html('<span class="text-secondary">&mdash;</span>')
+            return helpers.HTML_NONE
 
         return super().render_value(key, value, context)
 
@@ -2309,7 +2308,7 @@ class DeviceComponentPageMixin:
                     view_name=device_breadcrumb_url,
                     should_render=lambda c: c["object"].device is not None,
                     reverse_kwargs=lambda c: {"pk": c["object"].device.pk},
-                    label=lambda c: bettertitle(c["object"]._meta.verbose_name_plural),
+                    label=lambda c: helpers.bettertitle(c["object"]._meta.verbose_name_plural),
                 ),
             )
 
@@ -2319,7 +2318,7 @@ class DeviceComponentPageMixin:
                     view_name=module_breadcrumb_url,
                     should_render=lambda c: c["object"].device is None,
                     reverse_kwargs=lambda c: {"pk": c["object"].module.pk},
-                    label=lambda c: bettertitle(c["object"]._meta.verbose_name_plural),
+                    label=lambda c: helpers.bettertitle(c["object"]._meta.verbose_name_plural),
                 ),
             )
 

nautobot/extras/models/jobs.py

@@ -253,6 +253,7 @@ class Job(PrimaryModel):
     )
     objects = BaseManager.from_queryset(JobQuerySet)()
     is_data_compliance_model = False
+    is_version_controlled = False
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
 
@@ -533,6 +534,7 @@ class JobLogEntry(BaseModel):
 
     is_metadata_associable_model = False
     is_data_compliance_model = False
+    is_version_controlled = False
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
     hide_in_diff_view = True
@@ -585,6 +587,7 @@ class JobQueue(PrimaryModel):
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/jobqueue.html"
     is_data_compliance_model = False
+    is_version_controlled = False
 
     class Meta:
         ordering = ["name"]
@@ -616,6 +619,7 @@ class JobQueueAssignment(BaseModel):
     job_queue = models.ForeignKey(JobQueue, on_delete=models.CASCADE, related_name="job_assignments")
     is_metadata_associable_model = False
     is_data_compliance_model = False
+    is_version_controlled = False
 
     class Meta:
         unique_together = ["job", "job_queue"]
@@ -695,6 +699,7 @@ class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
     hide_in_diff_view = True
     is_data_compliance_model = False
+    is_version_controlled = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -897,7 +902,7 @@ class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
         # so that `run_kubernetes_job_and_return_job_result` is not executed again and the job will be run locally.
         if job_queue.queue_type == JobQueueTypeChoices.TYPE_KUBERNETES and not synchronous:
             # TODO: make this branch aware!
-            return run_kubernetes_job_and_return_job_result(job_queue, job_result, json.dumps(job_kwargs))
+            return run_kubernetes_job_and_return_job_result(job_result, json.dumps(job_kwargs))
 
         job_celery_kwargs = {
             "nautobot_job_job_model_id": job_model.id,
@@ -1277,6 +1282,7 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/job-scheduling-and-approvals.html"
     is_data_compliance_model = False
+    is_version_controlled = False
 
     def __str__(self):
         return f"{self.name}: {self.interval}"

nautobot/extras/signals.py

@@ -8,6 +8,7 @@ import uuid
 
 from db_file_storage.model_utils import delete_file
 from db_file_storage.storage import DatabaseFileStorage
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
@@ -19,6 +20,7 @@ from django.utils import timezone
 from django_prometheus.models import model_deletes, model_inserts, model_updates
 import redis.exceptions
 
+from nautobot.core.branching import BranchContext
 from nautobot.core.celery import app, import_jobs
 from nautobot.core.models import BaseModel
 from nautobot.core.utils.cache import construct_cache_key
@@ -214,6 +216,29 @@ def invalidate_gitrepository_provided_contents_cache(sender, **kwargs):
         cache.delete_pattern(f"{cache_key}(*)")
 
 
+def _object_change_branch_name(instance):
+    """
+    Get the version-control branch name (if any) that needs to be switched to for ObjectChanges on a given instance.
+    """
+    if "nautobot_version_control" not in settings.PLUGINS:
+        return None
+
+    # When modifying non-version-controlled models, which only get committed to DOLT_DEFAULT_BRANCH,
+    # we need to ensure that the corresponding ObjectChange also is created there, even if we're otherwise working
+    # in a non-default branch at the moment. Failing to do so would result in a Dolt error on transaction commit:
+    # "Cannot commit changes on more than one branch / database"
+    from nautobot_version_control.constants import DOLT_DEFAULT_BRANCH  # pylint: disable=import-error
+    from nautobot_version_control.utils import (  # pylint: disable=import-error
+        active_branch,
+        is_version_controlled_model,
+    )
+
+    if is_version_controlled_model(instance.__class__) or active_branch() == DOLT_DEFAULT_BRANCH:
+        return None  # no need to switch branches
+
+    return DOLT_DEFAULT_BRANCH  # need to switch temporarily to the default `main` branch for this record
+
+
 @receiver(post_save)
 @receiver(m2m_changed)
 def _handle_changed_object(sender, instance, raw=False, **kwargs):
@@ -242,60 +267,63 @@ def _handle_changed_object(sender, instance, raw=False, **kwargs):
 
     # Record an ObjectChange if applicable
     if hasattr(instance, "to_objectchange"):
+        branch_name = _object_change_branch_name(instance)
         user = change_context.get_user(instance)
-        # save a copy of this instance's field cache so it can be restored after serialization
-        # to prevent unexpected behavior when chaining multiple signal handlers
-        original_cache = instance._state.fields_cache.copy()
-
-        changed_object_type = ContentType.objects.get_for_model(instance)
-        changed_object_id = instance.id
 
-        # Generate a unique identifier for this change to stash in the change context
-        # This is used for deferred change logging and for looking up related changes without querying the database
-        unique_object_change_id = None
-        if user is not None:
-            unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}__{user.pk}"
-        else:
-            unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}"
-
-        # If a change already exists for this change_id, user, and object, update it instead of creating a new one.
-        # If the object was deleted then recreated with the same pk (don't do this), change the action to update.
-        if unique_object_change_id in change_context.deferred_object_changes:
-            related_changes = ObjectChange.objects.filter(
-                changed_object_type=changed_object_type,
-                changed_object_id=changed_object_id,
-                user=user,
-                request_id=change_context.change_id,
-            )
-
-            # Skip the database check when deferring object changes
-            if not change_context.defer_object_changes and related_changes.exists():
-                objectchange = instance.to_objectchange(action)
-                if objectchange is not None:
-                    most_recent_change = related_changes.order_by("-time").first()
-                    if most_recent_change.action == ObjectChangeActionChoices.ACTION_DELETE:
-                        most_recent_change.action = ObjectChangeActionChoices.ACTION_UPDATE
-                    most_recent_change.object_data = objectchange.object_data
-                    most_recent_change.object_data_v2 = objectchange.object_data_v2
-                    most_recent_change.save()
+        with BranchContext(branch_name=branch_name, user=user, autocommit=False):
+            # save a copy of this instance's field cache so it can be restored after serialization
+            # to prevent unexpected behavior when chaining multiple signal handlers
+            original_cache = instance._state.fields_cache.copy()
+
+            changed_object_type = ContentType.objects.get_for_model(instance)
+            changed_object_id = instance.id
+
+            # Generate a unique identifier for this change to stash in the change context
+            # This is used for deferred change logging and for looking up related changes without querying the database
+            unique_object_change_id = None
+            if user is not None:
+                unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}__{user.pk}"
+            else:
+                unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}"
+
+            # If a change already exists for this change_id, user, and object, update it instead of creating a new one.
+            # If the object was deleted then recreated with the same pk (don't do this), change the action to update.
+            if unique_object_change_id in change_context.deferred_object_changes:
+                related_changes = ObjectChange.objects.filter(
+                    changed_object_type=changed_object_type,
+                    changed_object_id=changed_object_id,
+                    user=user,
+                    request_id=change_context.change_id,
+                )
+
+                # Skip the database check when deferring object changes
+                if not change_context.defer_object_changes and related_changes.exists():
+                    objectchange = instance.to_objectchange(action)
+                    if objectchange is not None:
+                        most_recent_change = related_changes.order_by("-time").first()
+                        if most_recent_change.action == ObjectChangeActionChoices.ACTION_DELETE:
+                            most_recent_change.action = ObjectChangeActionChoices.ACTION_UPDATE
+                        most_recent_change.object_data = objectchange.object_data
+                        most_recent_change.object_data_v2 = objectchange.object_data_v2
+                        most_recent_change.save()
 
-        else:
-            change_context.deferred_object_changes[unique_object_change_id] = [
-                {"action": action, "instance": instance, "user": user}
-            ]
-            if not change_context.defer_object_changes:
-                objectchange = instance.to_objectchange(action)
-                if objectchange is not None:
-                    objectchange.user = user
-                    objectchange.request_id = change_context.change_id
-                    objectchange.change_context = change_context.context
-                    objectchange.change_context_detail = change_context.context_detail[
-                        :CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
-                    ]
-                    objectchange.save()
-
-        # restore field cache
-        instance._state.fields_cache = original_cache
+            else:
+                change_context.deferred_object_changes[unique_object_change_id] = [
+                    {"action": action, "instance": instance, "user": user}
+                ]
+                if not change_context.defer_object_changes:
+                    objectchange = instance.to_objectchange(action)
+                    if objectchange is not None:
+                        objectchange.user = user
+                        objectchange.request_id = change_context.change_id
+                        objectchange.change_context = change_context.context
+                        objectchange.change_context_detail = change_context.context_detail[
+                            :CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
+                        ]
+                        objectchange.save()
+
+            # restore field cache
+            instance._state.fields_cache = original_cache
 
     # Increment metric counters
     if action == ObjectChangeActionChoices.ACTION_CREATE:
@@ -326,71 +354,73 @@ def _handle_deleted_object(sender, instance, **kwargs):
 
     # Record an ObjectChange if applicable
     if hasattr(instance, "to_objectchange"):
+        branch_name = _object_change_branch_name(instance)
         user = change_context.get_user(instance)
 
-        # save a copy of this instance's field cache so it can be restored after serialization
-        # to prevent unexpected behavior when chaining multiple signal handlers
-        original_cache = instance._state.fields_cache.copy()
-
-        changed_object_type = ContentType.objects.get_for_model(instance)
-        changed_object_id = instance.id
-
-        # Generate a unique identifier for this change to stash in the change context
-        # This is used for deferred change logging and for looking up related changes without querying the database
-        unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}__{user.pk}"
-        save_new_objectchange = True
-
-        # if a change already exists for this change_id, user, and object, update it instead of creating a new one
-        # except in the case that the object was created and deleted in the same change_id
-        # we don't want to create a delete change for an object that never existed
-        if unique_object_change_id in change_context.deferred_object_changes:
-            cached_related_change = change_context.deferred_object_changes[unique_object_change_id][-1]
-            if cached_related_change["action"] != ObjectChangeActionChoices.ACTION_CREATE:
-                cached_related_change["action"] = ObjectChangeActionChoices.ACTION_DELETE
-                save_new_objectchange = False
-
-            related_changes = ObjectChange.objects.filter(
-                changed_object_type=changed_object_type,
-                changed_object_id=changed_object_id,
-                user=user,
-                request_id=change_context.change_id,
-            )
+        with BranchContext(branch_name=branch_name, user=user, autocommit=False):
+            # save a copy of this instance's field cache so it can be restored after serialization
+            # to prevent unexpected behavior when chaining multiple signal handlers
+            original_cache = instance._state.fields_cache.copy()
 
-            # Skip the database check when deferring object changes
-            if not change_context.defer_object_changes and related_changes.exists():
-                objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
-                if objectchange is not None:
-                    most_recent_change = related_changes.order_by("-time").first()
-                    if most_recent_change.action != ObjectChangeActionChoices.ACTION_CREATE:
-                        most_recent_change.action = ObjectChangeActionChoices.ACTION_DELETE
-                        most_recent_change.object_data = objectchange.object_data
-                        most_recent_change.object_data_v2 = objectchange.object_data_v2
-                        most_recent_change.save()
-                        save_new_objectchange = False
-
-        if save_new_objectchange:
-            change_context.deferred_object_changes.setdefault(unique_object_change_id, []).append(
-                {
-                    "action": ObjectChangeActionChoices.ACTION_DELETE,
-                    "instance": instance,
-                    "user": user,
-                    "changed_object_id": changed_object_id,
-                    "changed_object_type": changed_object_type,
-                }
-            )
-            if not change_context.defer_object_changes:
-                objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
-                if objectchange is not None:
-                    objectchange.user = user
-                    objectchange.request_id = change_context.change_id
-                    objectchange.change_context = change_context.context
-                    objectchange.change_context_detail = change_context.context_detail[
-                        :CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
-                    ]
-                    objectchange.save()
-
-        # restore field cache
-        instance._state.fields_cache = original_cache
+            changed_object_type = ContentType.objects.get_for_model(instance)
+            changed_object_id = instance.id
+
+            # Generate a unique identifier for this change to stash in the change context
+            # This is used for deferred change logging and for looking up related changes without querying the database
+            unique_object_change_id = f"{changed_object_type.pk}__{changed_object_id}__{user.pk}"
+            save_new_objectchange = True
+
+            # if a change already exists for this change_id, user, and object, update it instead of creating a new one
+            # except in the case that the object was created and deleted in the same change_id
+            # we don't want to create a delete change for an object that never existed
+            if unique_object_change_id in change_context.deferred_object_changes:
+                cached_related_change = change_context.deferred_object_changes[unique_object_change_id][-1]
+                if cached_related_change["action"] != ObjectChangeActionChoices.ACTION_CREATE:
+                    cached_related_change["action"] = ObjectChangeActionChoices.ACTION_DELETE
+                    save_new_objectchange = False
+
+                related_changes = ObjectChange.objects.filter(
+                    changed_object_type=changed_object_type,
+                    changed_object_id=changed_object_id,
+                    user=user,
+                    request_id=change_context.change_id,
+                )
+
+                # Skip the database check when deferring object changes
+                if not change_context.defer_object_changes and related_changes.exists():
+                    objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
+                    if objectchange is not None:
+                        most_recent_change = related_changes.order_by("-time").first()
+                        if most_recent_change.action != ObjectChangeActionChoices.ACTION_CREATE:
+                            most_recent_change.action = ObjectChangeActionChoices.ACTION_DELETE
+                            most_recent_change.object_data = objectchange.object_data
+                            most_recent_change.object_data_v2 = objectchange.object_data_v2
+                            most_recent_change.save()
+                            save_new_objectchange = False
+
+            if save_new_objectchange:
+                change_context.deferred_object_changes.setdefault(unique_object_change_id, []).append(
+                    {
+                        "action": ObjectChangeActionChoices.ACTION_DELETE,
+                        "instance": instance,
+                        "user": user,
+                        "changed_object_id": changed_object_id,
+                        "changed_object_type": changed_object_type,
+                    }
+                )
+                if not change_context.defer_object_changes:
+                    objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
+                    if objectchange is not None:
+                        objectchange.user = user
+                        objectchange.request_id = change_context.change_id
+                        objectchange.change_context = change_context.context
+                        objectchange.change_context_detail = change_context.context_detail[
+                            :CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
+                        ]
+                        objectchange.save()
+
+            # restore field cache
+            instance._state.fields_cache = original_cache
 
     # Increment metric counters
     model_deletes.labels(instance._meta.model_name).inc()