nautobot 2.4.21__py3-none-any.whl → 2.4.22__py3-none-any.whl

nautobot/apps/choices.py

@@ -14,8 +14,10 @@ from nautobot.dcim.choices import (
     ConsolePortTypeChoices,
     DeviceFaceChoices,
     DeviceRedundancyGroupFailoverStrategyChoices,
+    InterfaceDuplexChoices,
     InterfaceModeChoices,
     InterfaceRedundancyGroupProtocolChoices,
+    InterfaceSpeedChoices,
     InterfaceTypeChoices,
     PortTypeChoices,
     PowerFeedBreakerPoleChoices,
@@ -84,8 +86,10 @@ __all__ = (
     "IPAddressRoleChoices",
     "IPAddressTypeChoices",
     "IPAddressVersionChoices",
+    "InterfaceDuplexChoices",
     "InterfaceModeChoices",
     "InterfaceRedundancyGroupProtocolChoices",
+    "InterfaceSpeedChoices",
     "InterfaceTypeChoices",
     "JobExecutionType",
     "JobResultStatusChoices",

nautobot/apps/utils.py

@@ -26,10 +26,13 @@ from nautobot.core.utils.filtering import (
 from nautobot.core.utils.git import BranchDoesNotExist, convert_git_diff_log_to_list, GitRepo, swap_status_initials
 from nautobot.core.utils.logging import sanitize
 from nautobot.core.utils.lookup import (
+    get_breadcrumbs_for_model,
     get_changes_for_model,
+    get_detail_view_components_context_for_model,
     get_filterset_for_model,
     get_form_for_model,
     get_model_from_name,
+    get_object_detail_content_for_model,
     get_related_class_for_model,
     get_related_field_for_models,
     get_route_for_model,
@@ -37,6 +40,7 @@ from nautobot.core.utils.lookup import (
     get_url_for_url_pattern,
     get_url_patterns,
     get_view_for_model,
+    get_view_titles_for_model,
 )
 from nautobot.core.utils.migrations import migrate_content_type_references_to_new_model
 from nautobot.core.utils.permissions import (
@@ -97,8 +101,10 @@ __all__ = (
     "generate_signature",
     "get_all_lookup_expr_for_field",
     "get_base_template",
+    "get_breadcrumbs_for_model",
     "get_celery_queues",
     "get_changes_for_model",
+    "get_detail_view_components_context_for_model",
     "get_filter_field_label",
     "get_filterable_params_from_filter_params",
     "get_filterset_field",
@@ -107,6 +113,7 @@ __all__ = (
     "get_form_for_model",
     "get_latest_release",
     "get_model_from_name",
+    "get_object_detail_content_for_model",
     "get_permission_for_model",
     "get_related_class_for_model",
     "get_related_field_for_models",
@@ -116,6 +123,7 @@ __all__ = (
     "get_url_for_url_pattern",
     "get_url_patterns",
     "get_view_for_model",
+    "get_view_titles_for_model",
     "get_worker_count",
     "hex_to_rgb",
     "image_upload",

nautobot/circuits/views.py

@@ -60,7 +60,7 @@ class CircuitTypeUIViewSet(NautobotUIViewSet):
 
 class CircuitTerminationObjectFieldsPanel(ObjectFieldsPanel):
     def get_extra_context(self, context):
-        return {"termination": context["object"]}
+        return {"termination": context["object"], **super().get_extra_context(context)}
 
     def render_key(self, key, value, context):
         if key == "connected_endpoint":
@@ -226,7 +226,11 @@ class CircuitUIViewSet(NautobotUIViewSet):
             return True
 
         def get_extra_context(self, context):
-            return {"termination": context[self.context_object_key], "side": self.side}
+            return {
+                "termination": context[self.context_object_key],
+                "side": self.side,
+                **super().get_extra_context(context),
+            }
 
         def get_data(self, context):
             """

nautobot/core/cli/migrate_deprecated_templates.py

@@ -4,15 +4,16 @@ import re
 
 TEMPLATE_REPLACEMENTS = {
     # Format: new_template: [old_template1, old_template2, ...]
-    "circuits/circuit_create.html": ["circuits/circuit_edit.html"],
-    "circuits/circuittermination_create.html": ["circuits/circuittermination_edit.html"],
-    "circuits/provider_create.html": ["circuits/provider_edit.html"],
-    "circuits/provider_retrieve.html": ["circuits/provider.html"],
+    "circuits/circuit_create.html": ["circuits/circuit_edit.html", "circuits/circuit_update.html"],
+    "circuits/circuittermination_create.html": [
+        "circuits/circuittermination_edit.html",
+        "circuits/circuittermination_update.html",
+    ],
+    "circuits/provider_create.html": ["circuits/provider_edit.html", "circuits/provider_update.html"],
     "dcim/cable_retrieve.html": ["dcim/cable.html"],
     "dcim/cable_update.html": ["dcim/cable_edit.html"],
     "dcim/device_create.html": ["dcim/device_edit.html"],
     "dcim/devicetype_update.html": ["dcim/devicetype_edit.html"],
-    "dcim/location_retrieve.html": ["dcim/location.html"],
     "dcim/location_update.html": ["dcim/location_edit.html"],
     "dcim/rack_retrieve.html": ["dcim/rack.html"],
     "dcim/rack_update.html": ["dcim/rack_edit.html"],
@@ -26,10 +27,9 @@ TEMPLATE_REPLACEMENTS = {
     "extras/dynamicgroup_update.html": ["extras/dynamicgroup_edit.html"],
     "extras/gitrepository_retrieve.html": ["extras/gitrepository.html"],
     "extras/gitrepository_update.html": ["extras/gitrepository_object_edit.html"],
-    "extras/graphqlquery_retrieve.html": ["extras/graphqlquery.html"],
     "extras/jobresult_retrieve.html": ["extras/jobresult.html"],
-    "extras/note_retrieve.html": ["extras/note.html"],
     "extras/objectchange_retrieve.html": ["extras/objectchange.html"],
+    "extras/secret_create.html": ["extras/secret_edit.html"],
     "extras/secretsgroup_update.html": ["extras/secretsgroup_edit.html"],
     "extras/tag_update.html": ["extras/tag_edit.html"],
     "generic/object_bulk_create.html": ["generic/object_bulk_import.html"],
@@ -38,6 +38,7 @@ TEMPLATE_REPLACEMENTS = {
     "generic/object_changelog.html": ["extras/object_changelog.html"],
     "generic/object_create.html": ["dcim/powerpanel_edit.html", "generic/object_edit.html", "ipam/service_edit.html"],
     "generic/object_destroy.html": ["generic/object_delete.html"],
+    "generic/object_list.html": ["extras/graphqlquery_list.html", "extras/objectchange_list.html"],
     "generic/object_notes.html": ["extras/object_notes.html"],
     "generic/object_retrieve.html": [
         "circuits/circuit.html",
@@ -46,6 +47,8 @@ TEMPLATE_REPLACEMENTS = {
         "circuits/circuittermination_retrieve.html",
         "circuits/circuittype.html",
         "circuits/circuittype_retrieve.html",
+        "circuits/provider.html",
+        "circuits/provider_retrieve.html",
         "circuits/providernetwork.html",
         "circuits/providernetwork_retrieve.html",
         "cloud/cloudaccount_retrieve.html",
@@ -68,14 +71,18 @@ TEMPLATE_REPLACEMENTS = {
         "dcim/device/powerports.html",
         "dcim/device/rearports.html",
         "dcim/device/wireless.html",
+        "dcim/device_component.html",
         "dcim/devicefamily_retrieve.html",
         "dcim/deviceredundancygroup_retrieve.html",
         "dcim/devicetype.html",
         "dcim/devicetype_retrieve.html",
         "dcim/interfaceredundancygroup_retrieve.html",
+        "dcim/location.html",
+        "dcim/location_retrieve.html",
         "dcim/locationtype.html",
         "dcim/locationtype_retrieve.html",
         "dcim/manufacturer.html",
+        "dcim/modulebay_retrieve.html",
         "dcim/platform.html",
         "dcim/powerfeed.html",
         "dcim/powerfeed_retrieve.html",
@@ -96,11 +103,17 @@ TEMPLATE_REPLACEMENTS = {
         "extras/customfield_retrieve.html",
         "extras/customlink.html",
         "extras/exporttemplate.html",
+        "extras/graphqlquery.html",
+        "extras/graphqlquery_retrieve.html",
         "extras/job_detail.html",
         "extras/jobbutton_retrieve.html",
         "extras/jobhook.html",
         "extras/jobqueue_retrieve.html",
         "extras/metadatatype_retrieve.html",
+        "extras/note.html",
+        "extras/note_retrieve.html",
+        "extras/relationship.html",
+        "extras/secret.html",
         "extras/secretsgroup.html",
         "extras/secretsgroup_retrieve.html",
         "extras/status.html",
@@ -108,13 +121,20 @@ TEMPLATE_REPLACEMENTS = {
         "extras/tag_retrieve.html",
         "extras/team_retrieve.html",
         "generic/object_detail.html",
+        "ipam/namespace_retrieve.html",
+        "ipam/prefix.html",
+        "ipam/prefix_retrieve.html",
         "ipam/rir.html",
+        "ipam/routetarget.html",
         "ipam/service.html",
         "ipam/service_retrieve.html",
         "ipam/vlan.html",
         "ipam/vlan_retrieve.html",
         "ipam/vlangroup.html",
+        "ipam/vrf.html",
         "tenancy/tenant.html",
+        "tenancy/tenantgroup.html",
+        "tenancy/tenantgroup_retrieve.html",
         "virtualization/clustergroup.html",
         "virtualization/clustertype.html",
         "virtualization/virtualmachine.html",
@@ -123,10 +143,9 @@ TEMPLATE_REPLACEMENTS = {
         "wireless/supporteddatarate_retrieve.html",
         "wireless/wirelessnetwork_retrieve.html",
     ],
-    "ipam/prefix_retrieve.html": ["ipam/prefix.html"],
+    "ipam/prefix_create.html": ["ipam/prefix_edit.html"],
     "ipam/vlan_update.html": ["ipam/vlan_edit.html"],
     "tenancy/tenant_create.html": ["tenancy/tenant_edit.html"],
-    "tenancy/tenantgroup_retrieve.html": ["tenancy/tenantgroup.html"],
     "virtualchassis_update.html": ["dcim/virtualchassis_edit.html"],
     "virtualization/virtualmachine_update.html": ["virtualization/virtualmachine_edit.html"],
 }

nautobot/core/filters.py

@@ -91,6 +91,10 @@ class MultiValueDateTimeFilter(django_filters.DateTimeFilter, django_filters.Mul
 class MultiValueNumberFilter(django_filters.NumberFilter, django_filters.MultipleChoiceFilter):
     field_class = multivalue_field_factory(django_forms.IntegerField)
 
+    def __init__(self, *args, choices=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.choices = list(choices) if choices is not None else None
+
 
 class MultiValueBigNumberFilter(MultiValueNumberFilter):
     """Subclass of MultiValueNumberFilter used for BigInteger model fields."""

nautobot/core/forms/__init__.py

@@ -68,6 +68,7 @@ from nautobot.core.forms.widgets import (
     DatePicker,
     DateTimePicker,
     MultiValueCharInput,
+    NumberWithSelect,
     SelectWithDisabled,
     SelectWithPK,
     SlugWidget,
@@ -124,6 +125,7 @@ __all__ = (
     "MultiValueCharInput",
     "MultipleContentTypeField",
     "NullableDateField",
+    "NumberWithSelect",
     "NumericArrayField",
     "PrefixFieldMixin",
     "ReturnURLForm",

nautobot/core/forms/widgets.py

@@ -6,7 +6,7 @@ from django import forms
 from django.forms.models import ModelChoiceIterator
 from django.urls import get_script_prefix
 
-from nautobot.core import choices
+from nautobot.core import choices as core_choices
 from nautobot.core.forms import utils
 
 __all__ = (
@@ -19,6 +19,7 @@ __all__ = (
     "ContentTypeSelect",
     "DatePicker",
     "DateTimePicker",
+    "NumberWithSelect",
     "SelectWithDisabled",
     "SelectWithPK",
     "SlugWidget",
@@ -68,7 +69,7 @@ class ColorSelect(forms.Select):
     option_template_name = "widgets/colorselect_option.html"
 
     def __init__(self, *args, **kwargs):
-        kwargs["choices"] = utils.add_blank_choice(choices.ColorChoices)
+        kwargs["choices"] = utils.add_blank_choice(core_choices.ColorChoices)
         super().__init__(*args, **kwargs)
         self.attrs["class"] = "nautobot-select2-color-picker"
 
@@ -282,3 +283,21 @@ class ClearableFileInput(forms.ClearableFileInput):
 
     class Media:
         js = ["bootstrap-filestyle-1.2.3/bootstrap-filestyle.min.js"]
+
+
+class NumberWithSelect(forms.NumberInput):
+    template_name = "widgets/number_input_with_choices.html"
+
+    def __init__(self, choices=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if choices is None:
+            self.choices = []
+        elif hasattr(choices, "CHOICES"):
+            self.choices = core_choices.unpack_grouped_choices(choices.CHOICES)
+        else:
+            self.choices = core_choices.unpack_grouped_choices(choices)
+
+    def get_context(self, name, value, attrs):
+        context = super().get_context(name, value, attrs)
+        context["widget"]["choices"] = self.choices
+        return context

nautobot/core/settings.py

@@ -822,6 +822,11 @@ CONSTANCE_CONFIG = {
         help_text="Whether to prefer IPv4 primary addresses over IPv6 primary addresses for devices.",
         field_type=bool,
     ),
+    "RACK_DEFAULT_U_HEIGHT": ConstanceConfigItem(
+        default=42,
+        help_text="Default height in rack units (U) for newly created racks. Must be between 1 and 500.",
+        field_type=int,
+    ),
     "RACK_ELEVATION_DEFAULT_UNIT_HEIGHT": ConstanceConfigItem(
         default=22, help_text="Default height (in pixels) of a rack unit in a rack elevation diagram", field_type=int
     ),
@@ -865,6 +870,7 @@ CONSTANCE_CONFIG_FIELDSETS = {
     "Pagination": ["PAGINATE_COUNT", "MAX_PAGE_SIZE", "PER_PAGE_DEFAULTS"],
     "Performance": ["JOB_CREATE_FILE_MAX_SIZE"],
     "Rack Elevation Rendering": [
+        "RACK_DEFAULT_U_HEIGHT",
         "RACK_ELEVATION_DEFAULT_UNIT_HEIGHT",
         "RACK_ELEVATION_DEFAULT_UNIT_WIDTH",
         "RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT",

nautobot/core/templates/widgets/number_input_with_choices.html

@@ -0,0 +1,44 @@
+<div class="input-group">
+    {% include 'django/forms/widgets/number.html' %}
+    {% if widget.choices %}
+        <span class="input-group-btn">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right">
+                {% for value, label in widget.choices %}
+                    <li><a href="#" data-name="{{ widget.name }}" data-value="{{ value }}" class="set_value">{{ label }}</a></li>
+                {% endfor %}
+            </ul>
+        </span>
+    {% endif %}
+</div>
+
+{% if widget.choices %}
+    <script type="text/javascript">
+        (function() {
+            if (window.__nbNumberWithSelectWidgetBound) return;
+            window.__nbNumberWithSelectWidgetBound = true;
+            function bindNumberWithSelectHandler() {
+                document.addEventListener("click", function(e) {
+                    if (!e.target) return;
+                    var link = e.target.closest && e.target.closest("a.set_value");
+                    if (!link) return;
+                    e.preventDefault();
+                    var container = link.closest(".input-group");
+                    var name = link.getAttribute("data-name");
+                    var value = link.getAttribute("data-value");
+                    var input = container && name ? container.querySelector('input[name="' + name + '"]') : null;
+                    if (input) {
+                        input.value = value;
+                    }
+                });
+            }
+            if (document.readyState === 'loading') {
+                document.addEventListener('DOMContentLoaded', bindNumberWithSelectHandler);
+            } else {
+                bindNumberWithSelectHandler();
+            }
+        })();
+    </script>
+{% endif %}

nautobot/core/templatetags/helpers.py

@@ -393,17 +393,19 @@ def humanize_speed(speed):
         1544 => "1.544 Mbps"
         100000 => "100 Mbps"
         10000000 => "10 Gbps"
+        1000000000 => "1 Tbps"
+        1600000000 => "1.6 Tbps"
+        10000000000 => "10 Tbps"
     """
     if not speed:
         return ""
-    if speed >= 1000000000 and speed % 1000000000 == 0:
-        return f"{int(speed / 1000000000)} Tbps"
-    elif speed >= 1000000 and speed % 1000000 == 0:
-        return f"{int(speed / 1000000)} Gbps"
-    elif speed >= 1000 and speed % 1000 == 0:
-        return f"{int(speed / 1000)} Mbps"
+
+    if speed >= 1000000000:
+        return f"{speed / 1000000000:g} Tbps"
+    elif speed >= 1000000:
+        return f"{speed / 1000000:g} Gbps"
     elif speed >= 1000:
-        return f"{float(speed) / 1000} Mbps"
+        return f"{speed / 1000:g} Mbps"
     else:
         return f"{speed} Kbps"
 

nautobot/core/tests/nautobot_config.py

@@ -10,6 +10,9 @@ from nautobot.core.settings_funcs import parse_redis_connection
 
 ALLOWED_HOSTS = ["nautobot.example.com"]
 
+# Do *not* send anonymized install metrics when migration or post_upgrade management commands are run while testing
+INSTALLATION_METRICS_ENABLED = False
+
 # Discover test jobs from within the Nautobot source code
 JOBS_ROOT = os.path.join(
     os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "extras", "test_jobs"

nautobot/core/tests/test_templatetags_helpers.py

@@ -180,7 +180,13 @@ class NautobotTemplatetagsHelperTest(TestCase):
     def test_humanize_speed(self):
         self.assertEqual(helpers.humanize_speed(1544), "1.544 Mbps")
         self.assertEqual(helpers.humanize_speed(100000), "100 Mbps")
+        self.assertEqual(helpers.humanize_speed(2500000), "2.5 Gbps")
         self.assertEqual(helpers.humanize_speed(10000000), "10 Gbps")
+        self.assertEqual(helpers.humanize_speed(100000000), "100 Gbps")
+        self.assertEqual(helpers.humanize_speed(1000000000), "1 Tbps")
+        self.assertEqual(helpers.humanize_speed(1600000000), "1.6 Tbps")
+        self.assertEqual(helpers.humanize_speed(10000000000), "10 Tbps")
+        self.assertEqual(helpers.humanize_speed(100000000000), "100 Tbps")
 
     def test_tzoffset(self):
         self.assertTrue(callable(helpers.tzoffset))

nautobot/core/tests/test_ui.py

@@ -23,8 +23,10 @@ from nautobot.core.ui.object_detail import (
     Panel,
     SectionChoices,
 )
-from nautobot.dcim.models import DeviceRedundancyGroup
+from nautobot.dcim.models import Device, DeviceRedundancyGroup
+from nautobot.dcim.tables import DeviceModuleInterfaceTable
 from nautobot.dcim.tables.devices import DeviceTable
+from nautobot.dcim.views import DeviceUIViewSet
 
 
 class DataTablePanelTest(TestCase):
@@ -288,6 +290,52 @@ class ObjectDetailContentExtraTabsTest(TestCase):
         self.default_tabs_id.append("services")
         self.assertListEqual(tab_ids, self.default_tabs_id)
 
+    def test_tab_id_url_as_action(self):
+        """
+        Test that when you create a panel with a tab_id that matches a viewset action,
+        the return_url is constructed correctly.
+        """
+        self.add_permissions("dcim.add_interface", "dcim.change_interface")
+        device_info = Device.objects.first()
+
+        panel = DeviceUIViewSet.DeviceInterfacesTablePanel(
+            weight=100,
+            section=SectionChoices.FULL_WIDTH,
+            table_title="Interfaces",
+            table_class=DeviceModuleInterfaceTable,
+            table_attribute="vc_interfaces",
+            related_field_name="device",
+            tab_id="interfaces",
+        )
+        context = {"request": self.request, "object": device_info}
+        panel_context = panel.get_extra_context(context)
+
+        return_url = f"/dcim/devices/{device_info.pk}/interfaces/"
+        self.assertTrue(panel_context["body_content_table_add_url"].endswith(return_url))
+
+    def test_tab_id_url_as_param(self):
+        """
+        Test that when you create a panel with a tab_id that does NOT matches a viewset action,
+        the return_url is constructed correctly.
+        """
+        self.add_permissions("dcim.add_interface", "dcim.change_interface")
+        device_info = Device.objects.first()
+
+        panel = DeviceUIViewSet.DeviceInterfacesTablePanel(
+            weight=100,
+            section=SectionChoices.FULL_WIDTH,
+            table_title="Interfaces",
+            table_class=DeviceModuleInterfaceTable,
+            table_attribute="vc_interfaces",
+            related_field_name="device",
+            tab_id="interfaces-not-exist",
+        )
+        context = {"request": self.request, "object": device_info}
+        panel_context = panel.get_extra_context(context)
+
+        return_url = f"&return_url=/dcim/devices/{device_info.pk}/?tab=interfaces-not-exist"
+        self.assertTrue(panel_context["body_content_table_add_url"].endswith(return_url))
+
     def test_extra_tab_panel_context(self):
         """
         Confirming that extra tab panels produce the correct context,

nautobot/core/tests/test_utils.py

@@ -18,7 +18,13 @@ 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
-from nautobot.dcim import filters as dcim_filters, forms as dcim_forms, models as dcim_models, tables
+from nautobot.dcim import (
+    filters as dcim_filters,
+    forms as dcim_forms,
+    models as dcim_models,
+    tables,
+    views as dcim_views,
+)
 from nautobot.extras import models as extras_models, utils as extras_utils
 from nautobot.extras.choices import ObjectChangeActionChoices, RelationshipTypeChoices
 from nautobot.extras.filters import StatusFilterSet
@@ -213,6 +219,26 @@ class FlattenIterableTest(TestCase):
 class GetFooForModelTest(TestCase):
     """Tests for the various `get_foo_for_model()` functions."""
 
+    def test_get_breadcrumbs_for_model(self):
+        breadcrumbs = lookup.get_breadcrumbs_for_model(dcim_models.Device)
+        self.assertEqual(breadcrumbs.items, dcim_views.DeviceUIViewSet.get_breadcrumbs(dcim_models.Device).items)
+        breadcrumbs = lookup.get_breadcrumbs_for_model(dcim_models.Device, view_type="")
+        self.assertEqual(
+            breadcrumbs.items, dcim_views.DeviceUIViewSet.get_breadcrumbs(dcim_models.Device, view_type="").items
+        )
+
+    def test_get_detail_view_components_context_for_model(self):
+        context = lookup.get_detail_view_components_context_for_model(dcim_models.Device)
+        self.assertEqual(
+            context["breadcrumbs"].items, lookup.get_breadcrumbs_for_model(dcim_models.Device, view_type="").items
+        )
+        self.assertEqual(
+            context["object_detail_content"], lookup.get_object_detail_content_for_model(dcim_models.Device)
+        )
+        self.assertEqual(
+            context["view_titles"].titles, lookup.get_view_titles_for_model(dcim_models.Device, view_type="").titles
+        )
+
     def test_get_filterset_for_model(self):
         """
         Test that `get_filterset_for_model` returns the right FilterSet for various inputs.
@@ -235,6 +261,12 @@ class GetFooForModelTest(TestCase):
         self.assertEqual(lookup.get_form_for_model("dcim.location"), dcim_forms.LocationForm)
         self.assertEqual(lookup.get_form_for_model(dcim_models.Location), dcim_forms.LocationForm)
 
+    def test_get_object_detail_content_for_model(self):
+        self.assertEqual(
+            lookup.get_object_detail_content_for_model(dcim_models.Device),
+            dcim_views.DeviceUIViewSet.object_detail_content,
+        )
+
     def test_get_related_field_for_models(self):
         """
         Test that `get_related_field_for_models` returns the appropriate field for various inputs.
@@ -341,6 +373,14 @@ class GetFooForModelTest(TestCase):
         # Testing unconventional table name
         self.assertEqual(lookup.get_table_class_string_from_view_name("ipam:prefix_list"), "PrefixDetailTable")
 
+    def test_get_view_titles_for_model(self):
+        view_titles = lookup.get_view_titles_for_model(dcim_models.Device)
+        self.assertEqual(view_titles.titles, dcim_views.DeviceUIViewSet.get_view_titles(dcim_models.Device).titles)
+        view_titles = lookup.get_view_titles_for_model(dcim_models.Device, view_type="")
+        self.assertEqual(
+            view_titles.titles, dcim_views.DeviceUIViewSet.get_view_titles(dcim_models.Device, view_type="").titles
+        )
+
 
 class IsTaggableTest(TestCase):
     def test_is_taggable_true(self):

nautobot/core/ui/object_detail.py

@@ -39,7 +39,7 @@ from nautobot.core.templatetags.helpers import (
 )
 from nautobot.core.ui.choices import LayoutChoices, SectionChoices
 from nautobot.core.ui.utils import render_component_template
-from nautobot.core.utils.lookup import get_filterset_for_model, get_route_for_model
+from nautobot.core.utils.lookup import get_filterset_for_model, get_route_for_model, get_view_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import get_obj_from_context
@@ -879,7 +879,12 @@ class ObjectsTablePanel(Panel):
         related_field_name = self.related_field_name or self.table_filter or obj._meta.model_name
         return_url = context.get("return_url", obj.get_absolute_url())
         if self.tab_id:
-            return_url += f"?tab={self.tab_id}"
+            try:
+                # Check to see if the this is a NautobotUIViewset action
+                view = get_view_for_model(obj._meta.model)
+                return_url += getattr(view, self.tab_id).url_path + "/"
+            except AttributeError:
+                return_url += f"?tab={self.tab_id}"
 
         if self.add_button_route is not None:
             add_permissions = self.add_permissions

nautobot/core/urls.py

@@ -91,15 +91,14 @@ urlpatterns = [
 
 
 if settings.DEBUG:
-    try:
-        import debug_toolbar
+    urlpatterns += [path("theme-preview/", ThemePreviewView.as_view(), name="theme_preview")]
+
+
+if "debug_toolbar" in settings.INSTALLED_APPS:
+    from debug_toolbar.toolbar import debug_toolbar_urls
+
+    urlpatterns += debug_toolbar_urls()
 
-        urlpatterns += [
-            path("__debug__/", include(debug_toolbar.urls)),
-            path("theme-preview/", ThemePreviewView.as_view(), name="theme_preview"),
-        ]
-    except ImportError:
-        pass
 
 if settings.METRICS_ENABLED:
     if settings.METRICS_AUTHENTICATED:

nautobot/core/utils/filtering.py

@@ -101,6 +101,7 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
         BOOLEAN_CHOICES,
         DynamicModelMultipleChoiceField,
         MultipleContentTypeField,
+        MultiValueCharInput,
         StaticSelect2,
         StaticSelect2Multiple,
     )
@@ -121,7 +122,16 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
     elif isinstance(field, (MultiValueDecimalFilter, MultiValueFloatFilter)):
         form_field = forms.DecimalField()
     elif isinstance(field, NumberFilter):
-        form_field = forms.IntegerField()
+        # If "choices" are passed, then when 'exact' is used in an Advanced
+        # Filter, render a dropdown of choices instead of a free integer input
+        if field.lookup_expr == "exact" and getattr(field, "choices", None):
+            # Use a multi-value widget that allows both preset choices and free-form entries
+            form_field = forms.MultipleChoiceField(
+                choices=field.choices,
+                widget=MultiValueCharInput,
+            )
+        else:
+            form_field = forms.IntegerField()
     elif isinstance(field, ModelMultipleChoiceFilter):
         if getattr(field, "prefers_id", False):
             to_field_name = "id"