nautobot 2.4.10__py3-none-any.whl → 2.4.12__py3-none-any.whl

nautobot/circuits/templates/circuits/circuittermination_retrieve.html

@@ -6,117 +6,4 @@
     <li><a href="{% url 'circuits:circuit_list' %}?provider={{ object.circuit.provider.pk }}">{{ object.circuit.provider }}</a></li>
     <li>{{ object.circuit|hyperlinked_object }}</li>
     <li>{{ object|hyperlinked_object }}</li>
-{% endblock breadcrumbs %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    {% if object.location %}
-                        <tr>
-                            <td>Location</td>
-                            <td>{% include 'dcim/inc/location_hierarchy.html' with location=object.location %}</td>
-                        </tr>
-                    {% endif %}
-                    {% if object.provider_network %}
-                        <td>Provider Network</td>
-                        <td>
-                            {{ object.provider_network|hyperlinked_object }}
-                        </td>
-                    {% endif %}
-                    {% if object.cloud_network %}
-                        <td>Cloud Network</td>
-                        <td>
-                            {{ object.cloud_network|hyperlinked_object }}
-                        </td>
-                    {% endif %}
-                </tr>
-                {% if object.location %}
-                <tr>
-                    <td>Cable</td>
-                    <td>
-                        {% if object.cable %}
-                            {% if perms.dcim.delete_cable %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:cable_delete' pk=object.cable.pk %}?return_url={{ object.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-xs">
-                                        <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
-                                    </a>
-                                </div>
-                            {% endif %}
-                            {{ object.cable|hyperlinked_object }}
-                            <a href="{% url 'circuits:circuittermination_trace' pk=object.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                                <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
-                            </a>
-                            {% with peer=object.get_cable_peer %}
-                                to
-                                {% if peer.device %}
-                                    {{ peer.device|hyperlinked_object }}
-                                {% elif peer.circuit %}
-                                    {{ peer.circuit|hyperlinked_object }}
-                                {% endif %}
-                                ({{ peer }})
-                            {% endwith %}
-                        {% else %}
-                            {% if perms.dcim.add_cable %}
-                                <div class="pull-right">
-                                    <span class="dropdown">
-                                        <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right">
-                                            <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=object.pk termination_b_type='interface' %}?termination_b_location={{ object.location.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
-                                            <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=object.pk termination_b_type='front-port' %}?termination_b_location={{ object.location.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                                            <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?termination_b_location={{ object.location.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                                            <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?termination_b_location={{ object.location.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
-                                        </ul>
-                                    </span>
-                                </div>
-                            {% endif %}
-                            <span class="text-muted">Not defined</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <td>Speed</td>
-                    <td>
-                        {% if object.port_speed and object.upstream_speed %}
-                            <i class="mdi mdi-arrow-down-bold" title="Downstream"></i> {{ object.port_speed|humanize_speed }} &nbsp;
-                            <i class="mdi mdi-arrow-up-bold" title="Upstream"></i> {{ object.upstream_speed|humanize_speed }}
-                        {% elif object.port_speed %}
-                            {{ object.port_speed|humanize_speed }}
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>IP Addressing</td>
-                    <td>
-                        {% if object.connected_endpoint %}
-                            {% for ip in object.ip_addresses %}
-                                {% if not forloop.first %}<br />{% endif %}
-                                {{ ip|hyperlinked_object }} ({{ ip.vrf|default:"Global" }})
-                            {% empty %}
-                                <span class="text-muted">None</span>
-                            {% endfor %}
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Cross-Connect</td>
-                    <td>{{ object.xconnect_id|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Patch Panel/Port</td>
-                    <td>{{ object.pp_info|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-    </div>
-{% endblock content_left_page %}
+{% endblock breadcrumbs %}

nautobot/circuits/templates/circuits/inc/circuit_termination_header_extra_content.html

@@ -23,4 +23,4 @@
         <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
     </a>
     {% endif %}
-</div>
+</div>

nautobot/circuits/views.py

@@ -1,10 +1,10 @@
 from django.contrib import messages
 from django.db import transaction
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.html import format_html
+from django.utils.html import format_html, format_html_join
 
 from nautobot.core.forms import ConfirmationForm
-from nautobot.core.templatetags.helpers import bettertitle, humanize_speed, placeholder
+from nautobot.core.templatetags import helpers
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.ui.object_detail import (
     ObjectDetailContent,
@@ -13,6 +13,7 @@ from nautobot.core.ui.object_detail import (
 )
 from nautobot.core.ui.utils import render_component_template
 from nautobot.core.views import generic
+from nautobot.core.views.utils import get_obj_from_context
 from nautobot.core.views.viewsets import NautobotUIViewSet
 
 from . import filters, forms, tables
@@ -50,6 +51,38 @@ class CircuitTypeUIViewSet(NautobotUIViewSet):
     )
 
 
+class CircuitTerminationObjectFieldsPanel(ObjectFieldsPanel):
+    def get_extra_context(self, context):
+        return {"termination": context["object"]}
+
+    def render_key(self, key, value, context):
+        if key == "connected_endpoint":
+            return "IP Addressing"
+        return super().render_key(key, value, context)
+
+    def render_value(self, key, value, context):
+        instance = get_obj_from_context(context, self.context_object_key)
+        location = getattr(instance, "location", None)
+
+        # Cable column is hidden if the location is unset
+        if not location and key == "cable":
+            return None
+
+        if location and key == "cable":
+            return render_component_template("circuits/inc/circuit_termination_cable_fragment.html", context)
+
+        if key == "connected_endpoint":
+            ip_addresses = getattr(value, "ip_addresses", None)
+            if not ip_addresses or not ip_addresses.exists():
+                return helpers.HTML_NONE
+            return format_html_join(
+                ", ",
+                "{} ({})",
+                ((helpers.hyperlinked_object(ip), getattr(ip, "vrf", None) or "Global") for ip in ip_addresses.all()),
+            )
+        return super().render_value(key, value, context)
+
+
 class CircuitTerminationUIViewSet(NautobotUIViewSet):
     action_buttons = ("import", "export")
     bulk_update_form_class = forms.CircuitTerminationBulkEditForm
@@ -60,6 +93,41 @@ class CircuitTerminationUIViewSet(NautobotUIViewSet):
     serializer_class = serializers.CircuitTerminationSerializer
     table_class = tables.CircuitTerminationTable
 
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            CircuitTerminationObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields=[
+                    "location",
+                    "provider_network",
+                    "cloud_network",
+                    "cable",
+                    "port_speed",
+                    "upstream_speed",
+                    "connected_endpoint",
+                    "xconnect_id",
+                    "pp_info",
+                    "description",
+                ],
+                hide_if_unset=[
+                    "location",
+                    "provider_network",
+                    "cloud_network",
+                    "port_speed",
+                    "upstream_speed",
+                ],
+                exclude_fields=[
+                    "circuit",
+                ],
+                value_transforms={
+                    "port_speed": [helpers.humanize_speed],
+                    "upstream_speed": [helpers.humanize_speed],
+                },
+            ),
+        )
+    )
+
     def get_object(self):
         obj = super().get_object()
         if self.action in ["create", "update"] and "circuit" in self.kwargs:
@@ -127,8 +195,8 @@ class CircuitUIViewSet(NautobotUIViewSet):
                     "description",
                 ),
                 value_transforms={
-                    "port_speed": [humanize_speed, placeholder],
-                    "upstream_speed": [humanize_speed],
+                    "port_speed": [helpers.humanize_speed, helpers.placeholder],
+                    "upstream_speed": [helpers.humanize_speed],
                 },
                 hide_if_unset=("location", "provider_network", "cloud_network", "upstream_speed"),
                 ignore_nonexistent_fields=True,  # ip_addresses may be undefined
@@ -173,8 +241,10 @@ class CircuitUIViewSet(NautobotUIViewSet):
                     '<span title="{} ({})">{}</span>',
                     relationship.label,
                     relationship.key,
-                    bettertitle(relationship.get_label(side)),
+                    helpers.bettertitle(relationship.get_label(side)),
                 )
+            if key == "ip_addresses":
+                return "IP Addressing"
             return super().render_key(key, value, context)
 
         def render_value(self, key, value, context):
@@ -209,7 +279,7 @@ class CircuitUIViewSet(NautobotUIViewSet):
                 weight=100,
                 fields="__all__",
                 exclude_fields=["comments", "circuit_termination_a", "circuit_termination_z"],
-                value_transforms={"commit_rate": [humanize_speed, placeholder]},
+                value_transforms={"commit_rate": [helpers.humanize_speed, helpers.placeholder]},
             ),
             CircuitTerminationPanel(
                 label="Termination - A Side",

nautobot/cloud/navigation.py

@@ -8,7 +8,7 @@ from nautobot.core.apps import (
 menu_items = (
     NavMenuTab(
         name="Cloud",
-        weight=200,
+        weight=150,
         groups=(
             NavMenuGroup(
                 name="Cloud",

nautobot/cloud/tests/test_views.py

@@ -34,7 +34,6 @@ class CloudAccountTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "provider": providers[1].pk,
             "secrets_group": secrets_groups[1].pk,
             "description": "New description",
-            "comments": "New comments",
         }
 
     def test_post_without_secrets_group(self):
@@ -56,6 +55,12 @@ class CloudAccountTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class CloudNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = CloudNetwork
+    custom_action_required_permissions = {
+        "cloud:cloudnetwork_children": ["cloud.view_cloudnetwork"],
+        "cloud:cloudnetwork_prefixes": ["cloud.view_cloudnetwork", "ipam.view_prefix"],
+        "cloud:cloudnetwork_circuits": ["cloud.view_cloudnetwork", "circuits.view_circuit"],
+        "cloud:cloudnetwork_cloud_services": ["cloud.view_cloudnetwork", "cloud.view_cloudservice"],
+    }
 
     @classmethod
     def setUpTestData(cls):
@@ -104,6 +109,10 @@ class CloudNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class CloudResourceTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = CloudResourceType
+    custom_action_required_permissions = {
+        "cloud:cloudresourcetype_services": ["cloud.view_cloudresourcetype", "cloud.view_cloudservice"],
+        "cloud:cloudresourcetype_networks": ["cloud.view_cloudresourcetype", "cloud.view_cloudnetwork"],
+    }
 
     @classmethod
     def setUpTestData(cls):
@@ -133,6 +142,9 @@ class CloudResourceTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class CloudServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = CloudService
+    custom_action_required_permissions = {
+        "cloud:cloudservice_cloud_networks": ["cloud.view_cloudservice", "cloud.view_cloudnetwork"],
+    }
 
     @classmethod
     def setUpTestData(cls):

nautobot/cloud/views.py

@@ -64,7 +64,6 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
     table_class = CloudNetworkTable
     form_class = CloudNetworkForm
     bulk_update_form_class = CloudNetworkBulkEditForm
-
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
             object_detail.ObjectFieldsPanel(
@@ -153,19 +152,35 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
         ),
     )
 
-    @action(detail=True, url_path="children")
+    @action(detail=True, url_path="children", custom_view_base_action="view")
     def children(self, request, *args, **kwargs):
         return Response({})
 
-    @action(detail=True, url_path="prefixes")
+    @action(
+        detail=True,
+        url_path="prefixes",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["ipam.view_prefix"],
+    )
     def prefixes(self, request, *args, **kwargs):
         return Response({})
 
-    @action(detail=True, url_path="circuits")
+    @action(
+        detail=True,
+        url_path="circuits",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["circuits.view_circuit"],
+    )
     def circuits(self, request, *args, **kwargs):
         return Response({})
 
-    @action(detail=True, url_path="cloud-services", url_name="cloud_services")
+    @action(
+        detail=True,
+        url_path="cloud-services",
+        url_name="cloud_services",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["cloud.view_cloudservice"],
+    )
     def cloud_services(self, request, *args, **kwargs):
         return Response({})
 
@@ -178,7 +193,6 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
     table_class = CloudResourceTypeTable
     form_class = CloudResourceTypeForm
     bulk_update_form_class = CloudResourceTypeBulkEditForm
-
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
             object_detail.ObjectFieldsPanel(
@@ -230,11 +244,21 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
         ),
     )
 
-    @action(detail=True, url_path="networks")
+    @action(
+        detail=True,
+        url_path="networks",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["cloud.view_cloudnetwork"],
+    )
     def networks(self, request, *args, **kwargs):
         return Response({})
 
-    @action(detail=True, url_path="services")
+    @action(
+        detail=True,
+        url_path="services",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["cloud.view_cloudservice"],
+    )
     def services(self, request, *args, **kwargs):
         return Response({})
 
@@ -284,6 +308,12 @@ class CloudServiceUIViewSet(NautobotUIViewSet):
         ),
     )
 
-    @action(detail=True, url_path="cloud-networks", url_name="cloud_networks")
+    @action(
+        detail=True,
+        url_path="cloud-networks",
+        url_name="cloud_networks",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["cloud.view_cloudnetwork"],
+    )
     def cloud_networks(self, request, *args, **kwargs):
         return Response({})

nautobot/core/celery/__init__.py

@@ -3,10 +3,12 @@ import logging
 import os
 from pathlib import Path
 import shutil
+import sys
 
 from celery import Celery, shared_task, signals
 from celery.app.log import TaskFormatter
 from celery.utils.log import get_logger
+from django.apps import apps
 from django.conf import settings
 from django.db.utils import OperationalError, ProgrammingError
 from django.utils.functional import SimpleLazyObject
@@ -19,6 +21,7 @@ from nautobot.core.celery.control import discard_git_repository, refresh_git_rep
 from nautobot.core.celery.encoders import NautobotKombuJSONEncoder
 from nautobot.core.celery.log import NautobotDatabaseHandler
 from nautobot.core.utils.module_loading import import_modules_privately
+from nautobot.extras.plugins.utils import import_object
 from nautobot.extras.registry import registry
 
 logger = logging.getLogger(__name__)
@@ -47,12 +50,14 @@ app.autodiscover_tasks()
 def import_jobs(sender=None, **kwargs):
     """
     Import system Jobs into Nautobot as well as Jobs from JOBS_ROOT and GIT_ROOT.
+    Import app-provided jobs if the app provides dynamic jobs.
 
     Note that app-provided jobs are automatically imported at startup time via NautobotAppConfig.ready()
     """
     import nautobot.core.jobs  # noqa: F401
 
     _import_jobs_from_jobs_root()
+    _import_dynamic_jobs_from_apps()
 
     try:
         _import_jobs_from_git_repositories()
@@ -120,6 +125,22 @@ def _import_jobs_from_git_repositories():
         refresh_git_repository(state=None, repository_pk=repo.pk, head=repo.current_head)
 
 
+def _import_dynamic_jobs_from_apps():
+    for app_name in settings.PLUGINS:
+        app_config = apps.get_app_config(app_name)
+        if not getattr(app_config, "provides_dynamic_jobs", False):
+            continue
+
+        # Unload job modules from sys.modules if they were previously loaded
+        app_jobs = getattr(app_config, "features", {}).get("jobs", [])
+        for job in app_jobs:
+            if job.__module__ in sys.modules:
+                del sys.modules[job.__module__]
+
+        # Load app jobs
+        app_config.features["jobs"] = import_object(f"{app_config.__module__}.{app_config.jobs}")
+
+
 def add_nautobot_log_handler(logger_instance, log_format=None):
     """Add NautobotDatabaseHandler to logger and update logger level filtering to send all log levels to our handler."""
     if any(isinstance(h, NautobotDatabaseHandler) for h in logger_instance.handlers):

nautobot/core/celery/encoders.py

@@ -1,4 +1,5 @@
 import logging
+from zoneinfo import ZoneInfo
 
 from django.db import models
 from rest_framework.utils.encoders import JSONEncoder
@@ -52,5 +53,7 @@ class NautobotKombuJSONEncoder(JSONEncoder):
             # JobResult.result uses NautobotKombuJSONEncoder as an encoder and expects a JSONSerializable object,
             # although an exception, such as a RuntimeException, can be supplied as the obj.
             return f"{obj.__class__.__name__}: {obj}"
+        elif isinstance(obj, ZoneInfo):
+            return obj.key
         else:
             return super().default(obj)

nautobot/core/forms/forms.py

@@ -138,7 +138,10 @@ class BulkEditForm(forms.Form):
         # Handle M2M Save
         for key in self.cleaned_data.keys():
             if key.startswith(("add_", "remove_")):
-                field_name = key.lstrip("add_")
+                if key.startswith("add_"):
+                    field_name = key.lstrip("add_")
+                else:
+                    field_name = key.lstrip("remove_")
                 if field_name in m2m_field_names:
                     continue
                 with contextlib.suppress(FieldDoesNotExist):

nautobot/core/jobs/bulk_actions.py

@@ -96,12 +96,11 @@ class BulkEditObjects(Job):
                         model_field = None
 
                     # Handle nullification
-                    if nullified_fields:
-                        if field_name in form.nullable_fields and field_name in nullified_fields:
-                            if isinstance(model_field, ManyToManyField):
-                                getattr(obj, field_name).set([])
-                            else:
-                                setattr(obj, field_name, None if model_field is not None and model_field.null else "")
+                    if nullified_fields and field_name in nullified_fields and field_name in form.nullable_fields:
+                        if isinstance(model_field, ManyToManyField):
+                            getattr(obj, field_name).set([])
+                        else:
+                            setattr(obj, field_name, None if model_field is not None and model_field.null else "")
 
                     # ManyToManyFields
                     elif isinstance(model_field, ManyToManyField):
@@ -109,7 +108,8 @@ class BulkEditObjects(Job):
                             getattr(obj, field_name).set(form.cleaned_data[field_name])
                     # Normal fields
                     elif form.cleaned_data[field_name] not in (None, "", []):
-                        setattr(obj, field_name, form.cleaned_data[field_name])
+                        if hasattr(obj, field_name):
+                            setattr(obj, field_name, form.cleaned_data[field_name])
 
                 # Update custom fields
                 for field_name in form_custom_fields:
@@ -121,7 +121,7 @@ class BulkEditObjects(Job):
                 obj.full_clean()
                 obj.save()
                 updated_objects_pk.append(obj.pk)
-                form.post_save(obj)
+                form.post_save(obj)  # handles M2M add_* and remove_* form fields
 
                 if hasattr(form, "save_relationships") and callable(form.save_relationships):
                     # Add/remove relationship associations

nautobot/core/jobs/cleanup.py

@@ -65,6 +65,17 @@ class LogsCleanup(Job):
                 related_model = related_object.related_model
                 related_field_name = related_object.field.name
                 cascade_queryset = related_model.objects.filter(**{f"{related_field_name}__id__in": queryset})
+                if cascade_queryset.exists():
+                    self.recursive_delete_with_cascade(cascade_queryset, deletion_summary)
+
+        genericrelation_related_fields = [
+            field for field in queryset.model._meta.private_fields if hasattr(field, "bulk_related_objects")
+        ]
+        for gr_related_field in genericrelation_related_fields:
+            related_model = gr_related_field.related_model
+            related_field_name = gr_related_field.related_query_name()
+            cascade_queryset = related_model.objects.filter(**{f"{related_field_name}__id__in": queryset})
+            if cascade_queryset.exists():
                 self.recursive_delete_with_cascade(cascade_queryset, deletion_summary)
 
         deleted_count = queryset._raw_delete(using="default")

nautobot/core/management/commands/generate_test_data.py

@@ -225,7 +225,8 @@ class Command(BaseCommand):
         _create_batch(InterfaceTemplateFactory, 30)
         _create_batch(PowerPortTemplateFactory, 30)
         _create_batch(PowerOutletTemplateFactory, 30)
-        _create_batch(ModuleBayTemplateFactory, 90)
+        _create_batch(ModuleBayTemplateFactory, 60, description="without module families", has_module_family=False)
+        _create_batch(ModuleBayTemplateFactory, 30, description="with module families", has_module_family=True)
         _create_batch(ManufacturerFactory, 2, description="without Platforms or DeviceTypes")  # Last 2 hard-coded
         _create_batch(DeviceRedundancyGroupFactory, 20)
         _create_batch(DeviceFactory, 20)

nautobot/core/templates/components/panel/header_extra_content_table.html

@@ -1,3 +1,14 @@
 {% load helpers %}
 
-<strong>{{ body_content_table_verbose_name_plural|bettertitle }}</strong>  {% if body_content_table_list_url %}<a href="{{ body_content_table_list_url }}" class="badge badge-primary">{% if badge_count_override %} {{ badge_count_override }}{% else %}{{ body_content_table.rows|length }}{% endif %}</a>{% endif %}
+<strong>{{ body_content_table_verbose_name_plural|bettertitle }}</strong>
+{% if body_content_table_list_url %}
+    <a href="{{ body_content_table_list_url }}" class="badge badge-primary">{% if badge_count_override %}{{ badge_count_override }}{% else %}{{ body_content_table.rows|length }}{% endif %}</a>
+{% endif %}
+
+<div class="pull-right noprint">
+    {% if request.user.is_authenticated %}
+        {% table_config_button_small body_content_table %}
+    {% endif %}
+</div>
+
+{% table_config_form body_content_table %}

nautobot/core/templates/components/panel/panel.html

@@ -14,3 +14,7 @@
         </div>
     {% endif %}
 </div>
+
+{% if body_content_table.paginator %}
+    {% include 'inc/paginator.html' with paginator=body_content_table.paginator page=body_content_table.page %}
+{% endif %}

nautobot/core/templates/generic/object_retrieve.html

@@ -144,7 +144,7 @@
                 <div class="col-md-6">
                     {% block content_left_page %}{% endblock content_left_page %}
                     {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic custom_fields_advanced_ui=False computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
-                    {% include 'inc/relationships_panel.html' %}
+                    {% include 'inc/relationships/panel_override.html' with relationships_fields_override=object.get_relationships_data_basic_fields %}
                     {% include 'extras/inc/tags_panel.html' %}
                     {% plugin_left_page object %}
                 </div>
@@ -363,4 +363,5 @@
         }
     });
 </script>
+<script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/core/testing/mixins.py

@@ -5,7 +5,7 @@ from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
-from django.core.exceptions import FieldDoesNotExist
+from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist
 from django.db import connections, DEFAULT_DB_ALIAS
 from django.db.models import JSONField, ManyToManyField, ManyToManyRel
 from django.forms.models import model_to_dict
@@ -161,6 +161,24 @@ class NautobotTestCaseMixin:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ct)
 
+    def remove_permissions(self, *names, **kwargs):
+        """
+        Remove a set of permissions. Accepts permission names in the form <app>.<action>_<model>.
+        Additional keyword arguments will be passed to the ObjectPermission constructor to allow creating more detailed permissions.
+
+        Examples:
+            >>> remove_permissions("ipam.add_vlangroup", "ipam.view_vlangroup")
+            >>> remove_permissions("ipam.add_vlangroup", "ipam.view_vlangroup", constraints={"pk": "uuid-1234"})
+        """
+        for name in names:
+            _, action, _ = permissions.resolve_permission(name)
+            try:
+                obj_perm = users_models.ObjectPermission.objects.get(name=name, actions=[action], **kwargs)
+                obj_perm.delete()
+            except ObjectDoesNotExist:
+                # Permission does not exist, so nothing to remove
+                pass
+
     #
     # Custom assertions
     #