nautobot 2.4.11__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/core/jobs/cleanup.py

@@ -65,18 +65,18 @@ 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})
-                self.recursive_delete_with_cascade(cascade_queryset, deletion_summary)
+                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
-            if related_model == queryset.model:
-                continue  # avoid infinite recursion  # TODO: this won't catch A<-B<-A<-B loops...
             related_field_name = gr_related_field.related_query_name()
             cascade_queryset = related_model.objects.filter(**{f"{related_field_name}__id__in": queryset})
-            self.recursive_delete_with_cascade(cascade_queryset, deletion_summary)
+            if cascade_queryset.exists():
+                self.recursive_delete_with_cascade(cascade_queryset, deletion_summary)
 
         deleted_count = queryset._raw_delete(using="default")
         if deleted_count:

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

@@ -363,4 +363,5 @@
         }
     });
 </script>
+<script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/core/tests/test_utils.py

@@ -1,7 +1,3 @@
-import os
-import os.path
-import sys
-import tempfile
 from unittest import mock
 import uuid
 
@@ -21,11 +17,7 @@ from nautobot.core.models import fields as core_fields, utils as models_utils, v
 from nautobot.core.testing import TestCase
 from nautobot.core.utils import data as data_utils, filtering, lookup, querysets, requests
 from nautobot.core.utils.migrations import update_object_change_ct_for_replaced_models
-from nautobot.core.utils.module_loading import (
-    check_name_safe_to_import_privately,
-    clear_module_from_sys_modules,
-    import_modules_privately,
-)
+from nautobot.core.utils.module_loading import check_name_safe_to_import_privately
 from nautobot.dcim import filters as dcim_filters, forms as dcim_forms, models as dcim_models, tables
 from nautobot.extras import models as extras_models, utils as extras_utils
 from nautobot.extras.choices import ObjectChangeActionChoices, RelationshipTypeChoices
@@ -983,174 +975,6 @@ class TestModuleLoadingUtils(TestCase):
                 self.assertFalse(permitted)
                 self.assertIsInstance(reason, str)
 
-    def _create_test_files(self, root_directory: str, contents: dict):
-        """Helper function to create arbitrary text files in a given directory."""
-        for relative_path, file_contents in contents.items():
-            os.makedirs(os.path.dirname(os.path.join(root_directory, relative_path)), exist_ok=True)
-            with open(os.path.join(root_directory, relative_path), "wt") as fd:
-                fd.write(file_contents)
-
-    def test_import_modules_privately_jobs_root_case(self):
-        with tempfile.TemporaryDirectory() as tempdir:
-            try:
-                contents = {
-                    # Job file treated as a standalone module
-                    "some_jobs.py": 'name = "some_jobs"',
-                    # Job subdirectory treated as a package
-                    "my_jobs/__init__.py": '''\
-import my_jobs.some_submodule
-from . import relative_submodule
-name = "my_jobs"''',
-                    "my_jobs/some_submodule/__init__.py": 'name = "my_jobs.some_submodule"',
-                    "my_jobs/relative_submodule/__init__.py": 'name = "my_jobs.relative_submodule"',
-                    # Job file that shouldn't be loaded as it conflicts
-                    "tkinter.py": 'name = "tkinter"',
-                    # Job submodule that shouldn't be loaded as it conflicts
-                    "turtle/__init__.py": 'name = "turtle"',
-                }
-                self._create_test_files(tempdir, contents)
-
-                modules = import_modules_privately(tempdir, ignore_import_errors=False)
-                self.assertEqual(["my_jobs", "some_jobs"], sorted([module.__name__ for module in modules]))
-                # assertIn/assertNotIn are super noisy when dealing with the huge sys.modules dict, so instead:
-                if "some_jobs" not in sys.modules:
-                    self.fail("Valid module wasn't loaded from JOBS_ROOT")
-                if "my_jobs" not in sys.modules:
-                    self.fail("Valid package wasn't loaded from JOBS_ROOT")
-                with self.assertRaises(KeyError, msg="conflicting module name was loaded unsafely from JOBS_ROOT"):
-                    sys.modules["tkinter"]
-                with self.assertRaises(KeyError, msg="conflicting package name was loaded unsafely from JOBS_ROOT"):
-                    sys.modules["turtle"]
-
-                self.assertEqual(sys.modules["some_jobs"].name, "some_jobs")
-                self.assertEqual(sys.modules["my_jobs"].name, "my_jobs")
-                self.assertEqual(sys.modules["my_jobs"].some_submodule.name, "my_jobs.some_submodule")
-                # self.assertEqual(sys.modules["my_jobs"].relative_submodule.name, "my_jobs.relative_submodule")
-
-            finally:
-                clear_module_from_sys_modules("some_jobs")
-                clear_module_from_sys_modules("my_jobs")
-
-                self.assertNotIn("some_jobs", sys.modules.keys())
-                self.assertNotIn("my_jobs", sys.modules.keys())
-                self.assertNotIn("my_jobs.some_submodule", sys.modules.keys())
-
-            # Test reloading of modules after code changes
-            try:
-                contents["some_jobs.py"] = 'name = "some_jobs_new"'
-                contents["my_jobs/__init__.py"] = '''\
-import my_jobs.some_submodule
-from . import relative_submodule
-name = "my_jobs_new"'''
-                contents["my_jobs/some_submodule/__init__.py"] = 'name = "my_jobs.some_submodule_new"'
-                self._create_test_files(tempdir, contents)
-
-                modules = import_modules_privately(tempdir, ignore_import_errors=False)
-                self.assertEqual(["my_jobs", "some_jobs"], sorted([module.__name__ for module in modules]))
-                # assertIn/assertNotIn are super noisy when dealing with the huge sys.modules dict, so instead:
-                if "some_jobs" not in sys.modules:
-                    self.fail("Valid module wasn't loaded from JOBS_ROOT")
-                if "my_jobs" not in sys.modules:
-                    self.fail("Valid package wasn't loaded from JOBS_ROOT")
-                with self.assertRaises(KeyError, msg="conflicting module name was loaded unsafely from JOBS_ROOT"):
-                    sys.modules["tkinter"]
-                with self.assertRaises(KeyError, msg="conflicting package name was loaded unsafely from JOBS_ROOT"):
-                    sys.modules["turtle"]
-
-                self.assertEqual(sys.modules["some_jobs"].name, "some_jobs_new")
-                self.assertEqual(sys.modules["my_jobs"].name, "my_jobs_new")
-                self.assertEqual(sys.modules["my_jobs"].some_submodule.name, "my_jobs.some_submodule_new")
-
-            finally:
-                clear_module_from_sys_modules("some_jobs")
-                clear_module_from_sys_modules("my_jobs")
-
-                self.assertNotIn("some_jobs", sys.modules.keys())
-                self.assertNotIn("my_jobs", sys.modules.keys())
-                self.assertNotIn("my_jobs.some_submodule", sys.modules.keys())
-
-    def test_import_modules_privately_git_repo_jobs_case(self):
-        with tempfile.TemporaryDirectory() as tempdir:
-            try:
-                contents = {
-                    # Repo that we intend to load
-                    "my_repo/__init__.py": 'name = "my_repo"',
-                    "my_repo/jobs/__init__.py": '''\
-import my_repo.jobs.some_jobs
-from . import some_other_jobs
-name = "my_repo.jobs"''',
-                    "my_repo/jobs/some_jobs.py": 'name = "my_repo.jobs.some_jobs"',
-                    "my_repo/jobs/some_other_jobs.py": 'name = "my_repo.jobs.some_other_jobs"',
-                    # A separate repo, not intended to be loaded
-                    "other_repo/__init__.py": "",
-                    # File that shouldn't be loaded as it conflicts
-                    "tkinter.py": "",
-                    # Package that shouldn't be loaded as it conflicts
-                    "turtle/__init__.py": "",
-                }
-                self._create_test_files(tempdir, contents)
-
-                modules = import_modules_privately(tempdir, module_path=["my_repo", "jobs"], ignore_import_errors=False)
-                self.assertEqual(["my_repo", "my_repo.jobs"], sorted([module.__name__ for module in modules]))
-                # assertIn/assertNotIn are super noisy when dealing with the huge sys.modules dict, so instead:
-                if "my_repo" not in sys.modules:
-                    self.fail("Valid repo wasn't loaded from GIT_ROOT")
-                if "my_repo.jobs" not in sys.modules:
-                    self.fail("Valid repo subdirectory wasn't loaded from GIT_ROOT")
-                with self.assertRaises(KeyError, msg="unexpected repo was loaded from GIT_ROOT"):
-                    sys.modules["other_repo"]
-                with self.assertRaises(KeyError, msg="conflicting module name was loaded unsafely from GIT_ROOT"):
-                    sys.modules["tkinter"]
-                with self.assertRaises(KeyError, msg="conflicting package name was loaded unsafely from GIT_ROOT"):
-                    sys.modules["turtle"]
-
-                self.assertEqual(sys.modules["my_repo"].name, "my_repo")
-                self.assertEqual(sys.modules["my_repo.jobs"].name, "my_repo.jobs")
-                self.assertEqual(sys.modules["my_repo.jobs"].some_jobs.name, "my_repo.jobs.some_jobs")
-                self.assertEqual(sys.modules["my_repo.jobs"].some_other_jobs.name, "my_repo.jobs.some_other_jobs")
-
-            finally:
-                clear_module_from_sys_modules("my_repo")
-
-                self.assertNotIn("my_repo", sys.modules.keys())
-                self.assertNotIn("my_repo.jobs", sys.modules.keys())
-
-            # Test reloading of modules after code changes
-            try:
-                contents["my_repo/__init__.py"] = 'name = "my_repo_new"'
-                contents["my_repo/jobs/__init__.py"] = '''\
-import my_repo.jobs.some_jobs
-from . import some_other_jobs
-name = "my_repo.jobs_new"'''
-                contents["my_repo/jobs/some_jobs.py"] = 'name = "my_repo.jobs.some_jobs_new"'
-                contents["my_repo/jobs/some_other_jobs.py"] = 'name = "my_repo.jobs.some_other_jobs_new"'
-                self._create_test_files(tempdir, contents)
-
-                modules = import_modules_privately(tempdir, module_path=["my_repo", "jobs"], ignore_import_errors=False)
-                self.assertEqual(["my_repo", "my_repo.jobs"], sorted([module.__name__ for module in modules]))
-                # assertIn/assertNotIn are super noisy when dealing with the huge sys.modules dict, so instead:
-                if "my_repo" not in sys.modules:
-                    self.fail("Valid repo wasn't loaded from GIT_ROOT")
-                if "my_repo.jobs" not in sys.modules:
-                    self.fail("Valid repo subdirectory wasn't loaded from GIT_ROOT")
-                with self.assertRaises(KeyError, msg="unexpected repo was loaded from GIT_ROOT"):
-                    sys.modules["other_repo"]
-                with self.assertRaises(KeyError, msg="conflicting module name was loaded unsafely from GIT_ROOT"):
-                    sys.modules["tkinter"]
-                with self.assertRaises(KeyError, msg="conflicting package name was loaded unsafely from GIT_ROOT"):
-                    sys.modules["turtle"]
-
-                self.assertEqual(sys.modules["my_repo"].name, "my_repo_new")
-                self.assertEqual(sys.modules["my_repo.jobs"].name, "my_repo.jobs_new")
-                self.assertEqual(sys.modules["my_repo.jobs"].some_jobs.name, "my_repo.jobs.some_jobs_new")
-                self.assertEqual(sys.modules["my_repo.jobs"].some_other_jobs.name, "my_repo.jobs.some_other_jobs_new")
-
-            finally:
-                clear_module_from_sys_modules("my_repo")
-
-                self.assertNotIn("my_repo", sys.modules.keys())
-                self.assertNotIn("my_repo.jobs", sys.modules.keys())
-
 
 class TestQuerySetUtils(TestCase):
     def test_maybe_select_related(self):

nautobot/core/tests/test_views.py

@@ -764,11 +764,11 @@ class TestObjectDetailView(TestCase):
         url = reverse("circuits:provider", args=(provider.pk,))
         response = self.client.get(f"{url}?tab=main")
         self.assertHttpStatus(response, 200)
-        response_data = response.content.decode(response.charset)
+        response_data = extract_page_body(response.content.decode(response.charset))
         view_move_url = reverse("circuits:circuit_list") + f"?provider={provider.id}"
 
         # Assert Badge Count in table panel header
-        panel_header = f"""<div class="panel-heading"><strong>Circuits</strong> <a href="{view_move_url}" class="badge badge-primary">10</a></div>"""
+        panel_header = f"""<strong>Circuits</strong> <a href="{view_move_url}" class="badge badge-primary">10</a>"""
         self.assertInHTML(panel_header, response_data)
 
         # Assert view X more btn

nautobot/core/ui/object_detail.py

@@ -867,7 +867,7 @@ class ObjectsTablePanel(Panel):
                 body_content_table_queryset = body_content_table_queryset.order_by(*self.order_by_fields)
             body_content_table_queryset = body_content_table_queryset.distinct()
             body_content_table = body_content_table_class(
-                body_content_table_queryset, hide_hierarchy_ui=self.hide_hierarchy_ui
+                body_content_table_queryset, hide_hierarchy_ui=self.hide_hierarchy_ui, user=request.user
             )
             if self.tab_id and "actions" in body_content_table.columns:
                 # Use the `self.tab_id`, if it exists, to determine the correct return URL for the table