nautobot 2.2.0__py3-none-any.whl → 2.2.0b1__py3-none-any.whl

nautobot/extras/tests/test_filters.py

@@ -61,7 +61,6 @@ from nautobot.extras.models import (
     ComputedField,
     ConfigContext,
     Contact,
-    ContactAssociation,
     CustomField,
     CustomFieldChoice,
     CustomLink,
@@ -458,91 +457,7 @@ class ContentTypeFilterSetTestCase(FilterTestCases.FilterTestCase):
         )
 
 
-class ContactAndTeamFilterSetTestCaseMixin:
-    """Mixin class to test common filters to both Contact and Team filter sets."""
-
-    def test_similar_to_location_data(self):
-        """Complex test to test the complex `similar_to_location_data` method filter."""
-        ContactAssociation.objects.all().delete()
-        self.queryset.delete()
-        location_type = LocationType.objects.filter(parent__isnull=True).first()
-        location_status = Status.objects.get_for_model(Location).first()
-        test_locations = (
-            Location.objects.create(
-                location_type=location_type,
-                name="Filter Test Location 0",
-                status=location_status,
-                contact_name="match 0",
-            ),
-            Location.objects.create(
-                location_type=location_type,
-                name="Filter Test Location 1",
-                status=location_status,
-                contact_email="Test email for location 1 and 2",
-            ),
-            Location.objects.create(
-                location_type=location_type,
-                name="Filter Test Location 2",
-                status=location_status,
-                contact_email="TEST EMAIL FOR LOCATION 1 AND 2",
-                contact_phone="Test phone for location 2 and 3",
-            ),
-            Location.objects.create(
-                location_type=location_type,
-                name="Filter Test Location 3",
-                status=location_status,
-                contact_phone="Test phone for location 2 and 3",
-            ),
-            Location.objects.create(
-                location_type=location_type,
-                name="Filter Test Location 4",
-                status=location_status,
-                contact_name="Hopefully this doesn't match any random factory data",
-                contact_email="Hopefully this doesn't match any random factory data",
-                contact_phone="Hopefully this doesn't match any random factory data",
-                physical_address="Hopefully this doesn't match any random factory data",
-                shipping_address="Hopefully this doesn't match any random factory data",
-            ),
-        )
-
-        self.queryset.create(name="match 0")
-        self.queryset.create(name="match 1 and 2", email="Test email for location 1 and 2")
-        self.queryset.create(name="match 2 and 3", phone="Test phone for location 2 and 3")
-
-        # These subtests are confusing because we're trying to test the NaturalKeyOrPKMultipleChoiceFilter
-        # behavior while also testing the `similar_to_location_data` method filter behavior.
-        with self.subTest("Test name match"):
-            params = {"similar_to_location_data": [test_locations[0].pk]}
-            self.assertQuerysetEqualAndNotEmpty(
-                self.filterset(params, self.queryset).qs,
-                self.queryset.filter(name__in=["match 0"]),
-            )
-        with self.subTest("Test email match"):
-            params = {"similar_to_location_data": [test_locations[1].pk]}
-            self.assertQuerysetEqualAndNotEmpty(
-                self.filterset(params, self.queryset).qs,
-                self.queryset.filter(name__in=["match 1 and 2"]),
-            )
-        with self.subTest("Test phone match"):
-            params = {"similar_to_location_data": [test_locations[2].pk]}
-            self.assertQuerysetEqualAndNotEmpty(
-                self.filterset(params, self.queryset).qs,
-                self.queryset.filter(name__in=["match 1 and 2", "match 2 and 3"]),
-            )
-        with self.subTest("Test email and phone match"):
-            params = {"similar_to_location_data": [test_locations[1].pk, test_locations[3].name]}
-            self.assertQuerysetEqualAndNotEmpty(
-                self.filterset(params, self.queryset).qs,
-                self.queryset.filter(name__in=["match 1 and 2", "match 2 and 3"]),
-            )
-        with self.subTest("Test no match"):
-            params = {"similar_to_location_data": [test_locations[4].pk]}
-            self.assertFalse(self.filterset(params, self.queryset).qs.exists())
-            params = {"similar_to_location_data": [test_locations[4].name]}
-            self.assertFalse(self.filterset(params, self.queryset).qs.exists())
-
-
-class ContactFilterSetTestCase(ContactAndTeamFilterSetTestCaseMixin, FilterTestCases.FilterTestCase):
+class ContactFilterSetTestCase(FilterTestCases.FilterTestCase):
     queryset = Contact.objects.all()
     filterset = ContactFilterSet
 
@@ -1841,7 +1756,7 @@ class TagTestCase(FilterTestCases.NameOnlyFilterTestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)
 
 
-class TeamFilterSetTestCase(ContactAndTeamFilterSetTestCaseMixin, FilterTestCases.FilterTestCase):
+class TeamFilterSetTestCase(FilterTestCases.FilterTestCase):
     queryset = Team.objects.all()
     filterset = TeamFilterSet
 
@@ -1923,8 +1838,8 @@ class RoleTestCase(FilterTestCases.NameOnlyFilterTestCase):
     def test_content_types(self):
         device_ct = ContentType.objects.get_for_model(Device)
         rack_ct = ContentType.objects.get_for_model(Rack)
-        device_roles = self.queryset.filter(content_types__in=[device_ct, rack_ct]).distinct()
-        params = {"content_types": ["dcim.device", "dcim.rack"]}
+        device_roles = self.queryset.filter(content_types=device_ct)
+        params = {"content_types": ["dcim.device"]}
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, device_roles)
 
         rack_roles = self.queryset.filter(content_types=rack_ct)

nautobot/extras/tests/test_models.py

@@ -1810,15 +1810,6 @@ class JobResultTestCase(TestCase):
                 JobResult.objects.create(name="ExampleJob2", user=None, result=lambda: 1)
             self.assertEqual(str(err.exception), "Object of type function is not JSON serializable")
 
-    def test_get_task(self):
-        """Assert bug fix for `Cannot resolve keyword 'task_id' into field` #5440"""
-        data = {
-            "output": "valid data",
-        }
-        job_result = JobResult.objects.create(name="ExampleJob1", user=None, result=data)
-
-        self.assertEqual(JobResult.objects.get_task(job_result.pk), job_result)
-
 
 class WebhookTest(ModelTestCases.BaseModelTestCase):
     model = Webhook

nautobot/extras/tests/test_relationships.py

@@ -15,15 +15,7 @@ from nautobot.core.tables import RelationshipColumn
 from nautobot.core.testing import TestCase
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.core.utils.lookup import get_route_for_model
-from nautobot.dcim.models import (
-    Controller,
-    Device,
-    DeviceTypeToSoftwareImageFile,
-    Location,
-    LocationType,
-    Platform,
-    Rack,
-)
+from nautobot.dcim.models import Device, DeviceTypeToSoftwareImageFile, Location, LocationType, Platform, Rack
 from nautobot.dcim.tables import LocationTable
 from nautobot.dcim.tests.test_views import create_test_device
 from nautobot.extras.choices import RelationshipRequiredSideChoices, RelationshipSideChoices, RelationshipTypeChoices
@@ -1173,7 +1165,6 @@ class RequiredRelationshipTestMixin:
         # Protected FK to SoftwareImageFile prevents deletion
         DeviceTypeToSoftwareImageFile.objects.all().delete()
         # Protected FK to SoftwareVersion prevents deletion
-        Controller.objects.all().delete()
         Device.objects.all().update(software_version=None)
 
         # Create required relationships:

nautobot/extras/tests/test_views.py

@@ -17,21 +17,11 @@ from nautobot.core.choices import ColorChoices
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.core.testing import extract_form_failures, extract_page_body, TestCase, ViewTestCases
 from nautobot.core.testing.utils import disable_warnings, post_data
-from nautobot.dcim.models import (
-    ConsolePort,
-    Controller,
-    Device,
-    DeviceType,
-    Interface,
-    Location,
-    LocationType,
-    Manufacturer,
-)
+from nautobot.dcim.models import ConsolePort, Device, DeviceType, Interface, Location, LocationType, Manufacturer
 from nautobot.dcim.tests import test_views
 from nautobot.extras.choices import (
     CustomFieldTypeChoices,
     JobExecutionType,
-    LogLevelChoices,
     ObjectChangeActionChoices,
     SecretsGroupAccessTypeChoices,
     SecretsGroupSecretTypeChoices,
@@ -53,7 +43,6 @@ from nautobot.extras.models import (
     GraphQLQuery,
     Job,
     JobButton,
-    JobLogEntry,
     JobResult,
     Note,
     ObjectChange,
@@ -792,49 +781,6 @@ class DynamicGroupTestCase(
             "dynamic_group_memberships-MAX_NUM_FORMS": "1000",
         }
 
-    def test_get_object_dynamic_groups_anonymous(self):
-        url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
-        self.client.logout()
-        response = self.client.get(url, follow=True)
-        self.assertHttpStatus(response, 200)
-        self.assertRedirects(response, f"/login/?next={url}")
-
-    def test_get_object_dynamic_groups_without_permission(self):
-        url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
-        response = self.client.get(url)
-        self.assertHttpStatus(response, [403, 404])
-
-    def test_get_object_dynamic_groups_with_permission(self):
-        url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
-        self.add_permissions("dcim.view_device", "extras.view_dynamicgroup")
-        response = self.client.get(url)
-        self.assertHttpStatus(response, 200)
-        response_body = response.content.decode(response.charset)
-        self.assertIn("DG 1", response_body, msg=response_body)
-        self.assertIn("DG 2", response_body, msg=response_body)
-        self.assertIn("DG 3", response_body, msg=response_body)
-
-    def test_get_object_dynamic_groups_with_constrained_permission(self):
-        self.add_permissions("extras.view_dynamicgroup")
-        obj_perm = ObjectPermission(
-            name="View a device",
-            constraints={"pk": Device.objects.first().pk},
-            actions=["view"],
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Device))
-
-        url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
-        response = self.client.get(url)
-        self.assertHttpStatus(response, 200)
-        response_body = response.content.decode(response.charset)
-        self.assertIn("DG 1", response_body, msg=response_body)
-
-        url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.last().pk})
-        response = self.client.get(url)
-        self.assertHttpStatus(response, 404)
-
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_edit_saved_filter(self):
         """Test that editing a filter works using the edit view."""
@@ -990,34 +936,6 @@ class GitRepositoryTestCase(
         self.form_data = form_data
         super().test_edit_object_with_constrained_permission()
 
-    def test_post_sync_repo_anonymous(self):
-        self.client.logout()
-        url = reverse("extras:gitrepository_sync", kwargs={"pk": self._get_queryset().first().pk})
-        response = self.client.post(url, follow=True)
-        self.assertHttpStatus(response, 200)
-        self.assertRedirects(response, f"/login/?next={url}")
-
-    def test_post_sync_repo_without_permission(self):
-        url = reverse("extras:gitrepository_sync", kwargs={"pk": self._get_queryset().first().pk})
-        response = self.client.post(url)
-        self.assertHttpStatus(response, [403, 404])
-
-    # TODO: mock/stub out `enqueue_pull_git_repository_and_refresh_data` and test successful POST with permissions
-
-    def test_post_dryrun_repo_anonymous(self):
-        self.client.logout()
-        url = reverse("extras:gitrepository_dryrun", kwargs={"pk": self._get_queryset().first().pk})
-        response = self.client.post(url, follow=True)
-        self.assertHttpStatus(response, 200)
-        self.assertRedirects(response, f"/login/?next={url}")
-
-    def test_post_dryrun_repo_without_permission(self):
-        url = reverse("extras:gitrepository_dryrun", kwargs={"pk": self._get_queryset().first().pk})
-        response = self.client.post(url)
-        self.assertHttpStatus(response, [403, 404])
-
-    # TODO: mock/stub out `enqueue_git_repository_diff_origin_and_local` and test successful POST with permissions
-
 
 class NoteTestCase(
     ViewTestCases.CreateObjectViewTestCase,
@@ -1718,34 +1636,6 @@ class JobResultTestCase(
     def setUpTestData(cls):
         JobResult.objects.create(name="pass.TestPass")
         JobResult.objects.create(name="fail.TestFail")
-        JobLogEntry.objects.create(
-            log_level=LogLevelChoices.LOG_INFO,
-            job_result=JobResult.objects.first(),
-            grouping="run",
-            message="This is a test",
-        )
-
-    def test_get_joblogentrytable_anonymous(self):
-        url = reverse("extras:jobresult_log-table", kwargs={"pk": JobResult.objects.first().pk})
-        self.client.logout()
-        response = self.client.get(url, follow=True)
-        self.assertHttpStatus(response, 200)
-        self.assertRedirects(response, f"/login/?next={url}")
-
-    def test_get_joblogentrytable_without_permission(self):
-        url = reverse("extras:jobresult_log-table", kwargs={"pk": JobResult.objects.first().pk})
-        response = self.client.get(url)
-        self.assertHttpStatus(response, [403, 404])
-
-    def test_get_joblogentrytable_with_permission(self):
-        url = reverse("extras:jobresult_log-table", kwargs={"pk": JobResult.objects.first().pk})
-        self.add_permissions("extras.view_jobresult", "extras.view_joblogentry")
-        response = self.client.get(url)
-        self.assertHttpStatus(response, 200)
-        response_body = response.content.decode(response.charset)
-        self.assertIn("This is a test", response_body)
-
-    # TODO test with constrained permissions on both JobResult and JobLogEntry records
 
 
 class JobTestCase(
@@ -2598,7 +2488,6 @@ class RelationshipTestCase(
         )
 
         # Try deleting all devices and then editing the 6 VLANs (fails):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         response = self.client.post(
             reverse("ipam:vlan_bulk_edit"), data={"pk": [str(vlan.id) for vlan in vlans], "_apply": [""]}

nautobot/extras/views.py

@@ -917,7 +917,7 @@ class DynamicGroupBulkDeleteView(generic.BulkDeleteView):
     filterset = filters.DynamicGroupFilterSet
 
 
-class ObjectDynamicGroupsView(generic.GenericView):
+class ObjectDynamicGroupsView(View):
     """
     Present a list of dynamic groups associated to a particular object.
     base_template: The name of the template to extend. If not provided, "<app>/<model>.html" will be used.
@@ -1116,18 +1116,18 @@ def check_and_call_git_repository_function(request, pk, func):
         messages.error(request, "Unable to run job: Celery worker process not running.")
         return redirect(request.get_full_path(), permanent=False)
     else:
-        repository = get_object_or_404(GitRepository.objects.restrict(request.user, "change"), pk=pk)
+        repository = get_object_or_404(GitRepository, pk=pk)
         job_result = func(repository, request.user)
 
     return redirect(job_result.get_absolute_url())
 
 
-class GitRepositorySyncView(generic.GenericView):
+class GitRepositorySyncView(View):
     def post(self, request, pk):
         return check_and_call_git_repository_function(request, pk, enqueue_pull_git_repository_and_refresh_data)
 
 
-class GitRepositoryDryRunView(generic.GenericView):
+class GitRepositoryDryRunView(View):
     def post(self, request, pk):
         return check_and_call_git_repository_function(request, pk, enqueue_git_repository_diff_origin_and_local)
 
@@ -1806,7 +1806,7 @@ class JobResultView(generic.ObjectView):
         }
 
 
-class JobLogEntryTableView(generic.GenericView):
+class JobLogEntryTableView(View):
     """
     Display a table of `JobLogEntry` objects for a given `JobResult` instance.
     """
@@ -1814,7 +1814,7 @@ class JobLogEntryTableView(generic.GenericView):
     queryset = JobResult.objects.all()
 
     def get(self, request, pk=None):
-        instance = get_object_or_404(self.queryset.restrict(request.user, "view"), pk=pk)
+        instance = self.queryset.get(pk=pk)
         filter_q = request.GET.get("q")
         if filter_q:
             queryset = instance.job_log_entries.filter(
@@ -1893,7 +1893,7 @@ class ObjectChangeView(generic.ObjectView):
         }
 
 
-class ObjectChangeLogView(generic.GenericView):
+class ObjectChangeLogView(View):
     """
     Present a history of changes made to a particular object.
     base_template: The name of the template to extend. If not provided, "<app>/<model>.html" will be used.
@@ -1979,7 +1979,7 @@ class NoteDeleteView(generic.ObjectDeleteView):
     queryset = Note.objects.all()
 
 
-class ObjectNotesView(generic.GenericView):
+class ObjectNotesView(View):
     """
     Present a list of notes associated to a particular object.
     base_template: The name of the template to extend. If not provided, "<app>/<model>.html" will be used.
@@ -2000,7 +2000,7 @@ class ObjectNotesView(generic.GenericView):
                 "assigned_object_id": obj.pk,
             }
         )
-        notes_table = tables.NoteTable(obj.notes.restrict(request.user, "view"))
+        notes_table = tables.NoteTable(obj.notes)
 
         # Apply the request context
         paginate = {
@@ -2241,7 +2241,7 @@ class SecretView(generic.ObjectView):
         }
 
 
-class SecretProviderParametersFormView(generic.GenericView):
+class SecretProviderParametersFormView(View):
     """
     Helper view to SecretView; retrieve the HTML form appropriate for entering parameters for a given SecretsProvider.
     """

nautobot/ipam/api/urls.py

@@ -2,7 +2,8 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter(view_name="IPAM")
+router = OrderedDefaultRouter()
+router.APIRootView = views.IPAMRootView
 
 # Namespaces
 router.register("namespaces", views.NamespaceViewSet)

nautobot/ipam/api/views.py

@@ -6,6 +6,7 @@ from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import APIException
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
@@ -31,6 +32,16 @@ from nautobot.ipam.models import (
 
 from . import serializers
 
+
+class IPAMRootView(APIRootView):
+    """
+    IPAM API root view
+    """
+
+    def get_view_name(self):
+        return "IPAM"
+
+
 #
 # Namespace
 #

nautobot/ipam/tables.py

@@ -42,10 +42,28 @@ UTILIZATION_GRAPH = """
 {% if record.present_in_database %}{% utilization_graph record.get_utilization %}{% else %}—{% endif %}
 """
 
+PREFIX_LINK = """
+{% load helpers %}
+{% for i in record.ancestors.count|as_range %}
+    <i class="mdi mdi-circle-small"></i>
+{% endfor %}
+    <a href="\
+{% if record.present_in_database %}\
+{% url 'ipam:prefix' pk=record.pk %}\
+{% else %}\
+{% url 'ipam:prefix_add' %}\
+?prefix={{ record }}&namespace={{ object.namespace.pk }}\
+{% for loc in object.locations.all %}&locations={{ loc.pk }}{% endfor %}\
+{% if object.tenant %}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}{% endif %}\
+{% endif %}\
+">{{ record.prefix }}</a>
+"""
 
 PREFIX_COPY_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui%}
+{% for i in record.ancestors.count|as_range %}
+    <i class="mdi mdi-circle-small"></i>
+{% endfor %}
 <span class="hover_copy">
   <a href="\
 {% if record.present_in_database %}\
@@ -161,6 +179,7 @@ VLAN_LINK = """
 {% url 'ipam:vlan_add' %}\
 ?vid={{ record.vid }}&vlan_group={{ vlan_group.pk }}\
 {% if vlan_group.location %}&location={{ vlan_group.location.pk }}{% endif %}\
+{% if vlan_group.location %}&location={{ vlan_group.location.pk }}{% endif %}\
 " class="btn btn-xs btn-success">{{ record.available }} VLAN{{ record.available|pluralize }} available</a>\
 {% else %}
     {{ record.available }} VLAN{{ record.available|pluralize }} available
@@ -350,7 +369,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     namespace = tables.Column(linkify=True)
     vlan = tables.Column(linkify=True, verbose_name="VLAN")
     rir = tables.Column(linkify=True)
-    children = tables.Column(accessor="descendants_count", orderable=False)
+    children = tables.Column(accessor="descendants_count")
     date_allocated = tables.DateTimeColumn()
     location_count = LinkedCountColumn(
         viewname="dcim:location_list", url_params={"prefixes": "pk"}, verbose_name="Locations"
@@ -358,6 +377,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Prefix
+        orderable = False
         fields = (
             "pk",
             "prefix",

nautobot/ipam/tests/test_graphql.py

@@ -1,3 +1,4 @@
+from django.test import override_settings
 from django.urls import reverse
 from rest_framework import status
 
@@ -8,8 +9,8 @@ class TestPrefix(APITestCase):
     def setUp(self):
         super().setUp()
         self.api_url = reverse("graphql-api")
-        self.add_permissions("ipam.view_prefix")
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_prefix_ip_version(self):
         """Test ip_version is available for a Prefix via GraphQL."""
         get_prefixes_query = """
@@ -22,7 +23,7 @@ class TestPrefix(APITestCase):
         }
         """
         payload = {"query": get_prefixes_query}
-        response = self.client.post(self.api_url, payload, format="json", **self.header)
+        response = self.client.post(self.api_url, payload, format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         prefixes = response.data["data"]["prefixes"]
         self.assertIsInstance(prefixes, list)

nautobot/ipam/tests/test_views.py

@@ -126,7 +126,6 @@ class RIRTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 
 class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.ListObjectsViewTestCase):
     model = Prefix
-    filter_on_field = "prefix_length"
 
     @classmethod
     def setUpTestData(cls):

nautobot/ipam/views.py

@@ -793,7 +793,7 @@ class IPAddressEditView(generic.ObjectEditView):
             _, error_msg = retrieve_interface_or_vminterface_from_request(request)
             if error_msg:
                 messages.warning(request, error_msg)
-                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
+                return redirect(self.get_return_url(request), default_return_url="ipam:ipaddress_add")
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -876,17 +876,17 @@ class IPAddressAssignView(view_mixins.GetReturnURLMixin, generic.ObjectView):
     """
 
     queryset = IPAddress.objects.all()
+    default_return_url = "ipam:ipaddress_add"
 
     def dispatch(self, request, *args, **kwargs):
-        if request.user.is_authenticated:
-            # Redirect user if an interface has not been provided
-            if "interface" not in request.GET and "vminterface" not in request.GET:
-                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
+        # Redirect user if an interface has not been provided
+        if "interface" not in request.GET and "vminterface" not in request.GET:
+            return redirect(self.get_return_url(request))
 
-            _, error_msg = retrieve_interface_or_vminterface_from_request(request)
-            if error_msg:
-                messages.warning(request, error_msg)
-                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
+        _, error_msg = retrieve_interface_or_vminterface_from_request(request)
+        if error_msg:
+            messages.warning(request, error_msg)
+            return redirect(self.get_return_url(request))
 
         return super().dispatch(request, *args, **kwargs)
 

nautobot/project-static/css/base.css

@@ -27,7 +27,6 @@ body {
     transition-duration: var(--navbar-transition-duration);
     transition-timing-function: ease-in-out;
     transition-property: margin-left, width;
-    min-height: calc(100vh - 20px);
 }
 #main-content > .form {
     margin-top: 20px;

nautobot/project-static/docs/404.html

@@ -673,27 +673,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="/projects/core/en/stable/user-guide/administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="/projects/core/en/stable/user-guide/administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1899,7 +1878,7 @@
   
   
     <li class="md-nav__item">
-      <a href="/projects/core/en/stable/user-guide/feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="/projects/core/en/stable/user-guide/feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3164,11 +3143,11 @@
   
   
     <li class="md-nav__item">
-      <a href="/projects/core/en/stable/user-guide/core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="/projects/core/en/stable/user-guide/core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/apps/index.html

@@ -686,27 +686,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../user-guide/administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../user-guide/administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1912,7 +1891,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../user-guide/feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../user-guide/feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3177,11 +3156,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../user-guide/core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../user-guide/core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>