nautobot 2.4.17__py3-none-any.whl → 2.4.18__py3-none-any.whl

nautobot/dcim/templates/dcim/virtualchassis_retrieve.html

@@ -1,51 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Virtual Chassis</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Domain</td>
-                    <td>{{ object.domain|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Master</td>
-                    <td>{{ object.master|hyperlinked_object }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Members</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <th>Device</th>
-                    <th>Position</th>
-                    <th>Master</th>
-                    <th>Priority</th>
-                </tr>
-                {% for vc_member in members %}
-                    <tr{% if vc_member == device %} class="info"{% endif %}>
-                        <td>{{ vc_member|hyperlinked_object }}</td>
-                        <td><span class="badge badge-default">{{ vc_member.vc_position }}</span></td>
-                        <td>{% if object.master == vc_member %}{{ True | render_boolean }}{% endif %}</td>
-                        <td>{{ vc_member.vc_priority|placeholder }}</td>
-                    </tr>
-                {% endfor %}
-            </table>
-            {% if perms.dcim.change_virtualchassis %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'dcim:virtualchassis_add_member' pk=object.pk %}?location={{ object.master.location.pk }}&rack={{ object.master.rack.pk }}" class="btn btn-primary btn-xs">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Member
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-{% endblock content_right_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/tests/test_views.py

@@ -4202,6 +4202,47 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         # Sanity check:
         self.assertBodyContains(response, "<th>Name</th>", html=True)
 
+    def test_set_master_after_adding_member(self):
+        """Ensure master can be set for a member that was added via the Add Member flow."""
+        self.add_permissions(
+            "dcim.view_device",
+            "dcim.view_virtualchassis",
+            "dcim.change_virtualchassis",
+            "dcim.change_device",
+        )
+
+        # Create VC
+        vc = VirtualChassis.objects.create(name="VC-test", domain="domain-test")
+
+        # Simulate adding a member via the separate "add-member" flow by creating the device with virtual_chassis
+        member = Device.objects.create(
+            device_type=self.devices[0].device_type,
+            role=self.devices[0].role,
+            status=self.devices[0].status,
+            name="separately-added-device",
+            location=self.devices[0].location,
+            virtual_chassis=vc,
+            vc_position=1,
+        )
+
+        # Now edit the VC and set the master to the existing member
+        payload_data = {
+            "name": vc.name,
+            "domain": vc.domain,
+            "master": str(member.pk),
+            # no members formset rows are required because the member already exists
+            "form-TOTAL_FORMS": "0",
+            "form-INITIAL_FORMS": "0",
+            "form-MIN_NUM_FORMS": "0",
+            "form-MAX_NUM_FORMS": "1000",
+        }
+
+        url = reverse("dcim:virtualchassis_edit", kwargs={"pk": vc.pk})
+        self.client.post(url, data=payload_data, follow=True)
+
+        vc.refresh_from_db()
+        self.assertEqual(vc.master, member)
+
 
 class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = PowerPanel

nautobot/dcim/views.py

@@ -21,7 +21,7 @@ from django.urls import reverse
 from django.utils.encoding import iri_to_uri
 from django.utils.functional import cached_property
 from django.utils.html import format_html
-from django.utils.http import url_has_allowed_host_and_scheme
+from django.utils.http import url_has_allowed_host_and_scheme, urlencode
 from django.views.generic import View
 from django_tables2 import RequestConfig
 from rest_framework.decorators import action
@@ -42,6 +42,7 @@ from nautobot.core.ui.breadcrumbs import (
     Breadcrumbs,
     InstanceBreadcrumbItem,
     ModelBreadcrumbItem,
+    ViewNameBreadcrumbItem,
 )
 from nautobot.core.ui.bulk_buttons import (
     BulkDeleteButton,
@@ -49,6 +50,7 @@ from nautobot.core.ui.bulk_buttons import (
     BulkRenameButton,
 )
 from nautobot.core.ui.choices import SectionChoices
+from nautobot.core.ui.titles import Titles
 from nautobot.core.utils.lookup import get_form_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import normalize_querydict
@@ -515,6 +517,7 @@ class RackGroupUIViewSet(NautobotUIViewSet):
         if self.action == "retrieve" and instance:
             racks = (
                 Rack.objects.restrict(request.user, "view")
+                # Note this filter - we want the table to include racks assigned to child rack groups as well
                 .filter(rack_group__in=instance.descendants(include_self=True))
                 .select_related("role", "location", "tenant")
             )
@@ -590,6 +593,10 @@ class RackElevationListView(generic.ObjectListView):
     filterset_form = forms.RackFilterForm
     action_buttons = []
     template_name = "dcim/rack_elevation_list.html"
+    view_titles = Titles(titles={"list": "Rack Elevation"})
+    breadcrumbs = Breadcrumbs(
+        items={"list": [ViewNameBreadcrumbItem(view_name="dcim:rack_elevation_list", label="Rack Elevation")]}
+    )
 
     def extra_context(self):
         racks = self.queryset
@@ -644,11 +651,15 @@ class RackReservationUIViewSet(NautobotUIViewSet):
 
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
-            object_detail.KeyValueTablePanel(
+            object_detail.ObjectFieldsPanel(
                 section=SectionChoices.LEFT_HALF,
                 weight=100,
                 label="Rack",
-                context_data_key="rack_data",
+                fields=["rack__location", "rack__rack_group", "rack"],
+                key_transforms={
+                    "rack__location": "Location",
+                    "rack__rack_group": "Rack Group",
+                },
             ),
             object_detail.ObjectFieldsPanel(
                 section=SectionChoices.LEFT_HALF,
@@ -664,23 +675,6 @@ class RackReservationUIViewSet(NautobotUIViewSet):
         ),
     )
 
-    def get_extra_context(self, request, instance):
-        context = super().get_extra_context(request, instance)
-        if self.action == "retrieve":
-            context["rack_data"] = self.get_rack_context(instance)
-        return context
-
-    def get_rack_context(self, instance):
-        rack = getattr(instance, "rack", None)
-        if not rack:
-            return {}
-
-        return {
-            "location": rack.location,
-            "rack_group": rack.rack_group,
-            "rack": rack,
-        }
-
     def get_object(self):
         obj = super().get_object()
 
@@ -1890,13 +1884,14 @@ class PlatformUIViewSet(NautobotUIViewSet):
 #
 
 
-class DeviceBreadcrumbsMixin:
+class DevicePageMixin:
     breadcrumbs = Breadcrumbs(
         items={
             "detail": [
                 ModelBreadcrumbItem(model=Device),
                 ModelBreadcrumbItem(
                     model=Device,
+                    label=lambda c: c["object"].location,
                     reverse_query_params=lambda c: {"location": c["object"].location.pk},
                 ),
                 InstanceBreadcrumbItem(
@@ -1911,6 +1906,49 @@ class DeviceBreadcrumbsMixin:
     )
 
 
+class DeviceComponentPageMixin:
+    """
+    This class hold the breadcrumbs paths for Device Components Pages like console ports.
+    Depending on whether the component is associated with a device or a module, the appropriate breadcrumb path will be rendered.
+
+    For example:
+    - Console Port assigned to the module: Modules / <Module name and link to details> / Console Ports (dcim/modules/<id>/console-ports/) / <Console Port name>
+    - Console Port assigned to the device: Devices / <Device name and link to details> / Console Ports (dcim/devices/<id>/console-ports/) / <Console Port name>
+    """
+
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(model=Device, should_render=lambda c: c["object"].device is not None),
+                InstanceBreadcrumbItem(
+                    instance=lambda c: c["object"].device, should_render=lambda c: c["object"].device is not None
+                ),
+                ViewNameBreadcrumbItem(
+                    view_name_key="device_breadcrumb_url",
+                    should_render=lambda c: c["object"].device is not None and c.get("device_breadcrumb_url"),
+                    reverse_kwargs=lambda c: {"pk": c["object"].device.pk},
+                    label=lambda c: c["object"]._meta.verbose_name_plural,
+                ),
+                ModelBreadcrumbItem(model=Module, should_render=lambda c: c["object"].device is None),
+                InstanceBreadcrumbItem(
+                    instance=lambda c: c["object"].module, should_render=lambda c: c["object"].device is None
+                ),
+                ViewNameBreadcrumbItem(
+                    view_name_key="module_breadcrumb_url",
+                    should_render=lambda c: c["object"].device is None and c.get("module_breadcrumb_url"),
+                    reverse_kwargs=lambda c: {"pk": c["object"].module.pk},
+                    label=lambda c: c["object"]._meta.verbose_name_plural,
+                ),
+            ]
+        }
+    )
+    view_titles = Titles(
+        titles={
+            "detail": "{% if object.device %}{{ object.device }}{% else %}{{ object.module.display }}{% endif %} / {{ object }}"
+        }
+    )
+
+
 class DeviceListView(generic.ObjectListView):
     queryset = Device.objects.select_related(
         "device_type__manufacturer",  # Needed for __str__() on device_type
@@ -1921,7 +1959,7 @@ class DeviceListView(generic.ObjectListView):
     template_name = "dcim/device_list.html"
 
 
-class DeviceView(generic.ObjectView):
+class DeviceView(DevicePageMixin, generic.ObjectView):
     queryset = Device.objects.select_related(
         "cluster__cluster_group",
         "controller_managed_device_group__controller",
@@ -2177,7 +2215,7 @@ class DeviceView(generic.ObjectView):
         }
 
 
-class DeviceComponentTabView(generic.ObjectView):
+class DeviceComponentTabView(DevicePageMixin, generic.ObjectView):
     queryset = Device.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -2185,6 +2223,7 @@ class DeviceComponentTabView(generic.ObjectView):
         module_count = instance.module_bays.filter(installed_module__isnull=False).count()
 
         return {
+            **super().get_extra_context(request, instance),
             "modulebay_count": modulebay_count,
             "module_count": f"{module_count}/{modulebay_count}",
         }
@@ -2444,7 +2483,7 @@ class DeviceConfigView(generic.ObjectView):
         }
 
 
-class DeviceConfigContextView(ObjectConfigContextView):
+class DeviceConfigContextView(DevicePageMixin, ObjectConfigContextView):
     base_template = "dcim/device/base.html"
 
     @cached_property
@@ -2455,7 +2494,7 @@ class DeviceConfigContextView(ObjectConfigContextView):
         return Device.objects.annotate_config_context_data()
 
 
-class DeviceChangeLogView(ObjectChangeLogView):
+class DeviceChangeLogView(DevicePageMixin, ObjectChangeLogView):
     base_template = "dcim/device/base.html"
 
 
@@ -3007,7 +3046,7 @@ class ConsolePortListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class ConsolePortView(generic.ObjectView):
+class ConsolePortView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = ConsolePort.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3073,7 +3112,7 @@ class ConsoleServerPortListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class ConsoleServerPortView(generic.ObjectView):
+class ConsoleServerPortView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = ConsoleServerPort.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3139,7 +3178,7 @@ class PowerPortListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class PowerPortView(generic.ObjectView):
+class PowerPortView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = PowerPort.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3205,7 +3244,7 @@ class PowerOutletListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class PowerOutletView(generic.ObjectView):
+class PowerOutletView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = PowerOutlet.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3271,7 +3310,10 @@ class InterfaceListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class InterfaceView(generic.ObjectView):
+class InterfaceView(
+    DeviceComponentPageMixin,
+    generic.ObjectView,
+):
     queryset = Interface.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3401,7 +3443,7 @@ class FrontPortListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class FrontPortView(generic.ObjectView):
+class FrontPortView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = FrontPort.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3467,7 +3509,7 @@ class RearPortListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class RearPortView(generic.ObjectView):
+class RearPortView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = RearPort.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3533,7 +3575,7 @@ class DeviceBayListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class DeviceBayView(generic.ObjectView):
+class DeviceBayView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = DeviceBay.objects.all()
 
     def get_extra_context(self, request, instance):
@@ -3695,6 +3737,35 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
             ),
         )
     )
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                # Breadcrumb path if ModuleBay is linked with device
+                ModelBreadcrumbItem(model=Device, should_render=lambda c: c["object"].parent_device),
+                InstanceBreadcrumbItem(
+                    instance=lambda c: c["object"].parent_device, should_render=lambda c: c["object"].parent_device
+                ),
+                ViewNameBreadcrumbItem(
+                    view_name_key="device_breadcrumb_url",
+                    should_render=lambda c: c["object"].parent_device and c.get("device_breadcrumb_url"),
+                    reverse_kwargs=lambda c: {"pk": c["object"].parent_device.pk},
+                    label=lambda c: c["object"]._meta.verbose_name_plural,
+                ),
+                # Breadcrumb path if ModuleBay is linked with module
+                ModelBreadcrumbItem(model=Module, should_render=lambda c: c["object"].parent_device is None),
+                InstanceBreadcrumbItem(
+                    instance=lambda c: c["object"].parent_module,
+                    should_render=lambda c: c["object"].parent_device is None,
+                ),
+                ViewNameBreadcrumbItem(
+                    view_name_key="module_breadcrumb_url",
+                    should_render=lambda c: c["object"].parent_device is None and c.get("module_breadcrumb_url"),
+                    reverse_kwargs=lambda c: {"pk": c["object"].parent_module.pk},
+                    label=lambda c: c["object"]._meta.verbose_name_plural,
+                ),
+            ]
+        }
+    )
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)
@@ -3748,7 +3819,7 @@ class InventoryItemListView(generic.ObjectListView):
     action_buttons = ("import", "export")
 
 
-class InventoryItemView(generic.ObjectView):
+class InventoryItemView(DeviceComponentPageMixin, generic.ObjectView):
     queryset = InventoryItem.objects.all().select_related("device", "manufacturer", "software_version")
 
     def get_extra_context(self, request, instance):
@@ -4108,6 +4179,10 @@ class ConsoleConnectionsListView(ConnectionsListView):
     table = tables.ConsoleConnectionTable
     template_name = "dcim/console_port_connection_list.html"
     action_buttons = ("export",)
+    view_titles = Titles(titles={"list": "Console Connections"})
+    breadcrumbs = Breadcrumbs(
+        items={"list": [ViewNameBreadcrumbItem(view_name="dcim:console_connections_list", label="Console Connections")]}
+    )
 
     def extra_context(self):
         return {
@@ -4124,6 +4199,10 @@ class PowerConnectionsListView(ConnectionsListView):
     table = tables.PowerConnectionTable
     template_name = "dcim/power_port_connection_list.html"
     action_buttons = ("export",)
+    view_titles = Titles(titles={"list": "Power Connections"})
+    breadcrumbs = Breadcrumbs(
+        items={"list": [ViewNameBreadcrumbItem(view_name="dcim:power_connections_list", label="Power Connections")]}
+    )
 
     def extra_context(self):
         return {
@@ -4140,6 +4219,12 @@ class InterfaceConnectionsListView(ConnectionsListView):
     table = tables.InterfaceConnectionTable
     template_name = "dcim/interface_connection_list.html"
     action_buttons = ("export",)
+    view_titles = Titles(titles={"list": "Interface Connections"})
+    breadcrumbs = Breadcrumbs(
+        items={
+            "list": [ViewNameBreadcrumbItem(view_name="dcim:interface_connections_list", label="Interface Connections")]
+        }
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -4182,10 +4267,50 @@ class VirtualChassisUIViewSet(NautobotUIViewSet):
     bulk_update_form_class = forms.VirtualChassisBulkEditForm
     filterset_class = filters.VirtualChassisFilterSet
     filterset_form_class = forms.VirtualChassisFilterForm
-    form_class = forms.VirtualChassisCreateForm
     serializer_class = serializers.VirtualChassisSerializer
     table_class = tables.VirtualChassisTable
     queryset = VirtualChassis.objects.all()
+    create_form_class = forms.VirtualChassisCreateForm
+    update_form_class = forms.VirtualChassisForm
+
+    class MembersObjectsTablePanel(object_detail.ObjectsTablePanel):
+        def _get_table_add_url(self, context):
+            obj = get_obj_from_context(context)
+            request = context["request"]
+            return_url = context.get("return_url", obj.get_absolute_url())
+
+            if not request.user.has_perm("dcim.change_virtualchassis"):
+                return None
+
+            params = []
+            master = obj.master
+
+            if master is not None:
+                if master.location is not None:
+                    params.append(("location", master.location.pk))
+
+                if master.rack is not None:
+                    params.append(("rack", master.rack.pk))
+
+            params.append(("return_url", return_url))
+            return reverse("dcim:virtualchassis_add_member", kwargs={"pk": obj.pk}) + "?" + urlencode(params)
+
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=[
+            object_detail.ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            MembersObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+                table_class=tables.VirtualChassisMembersTable,
+                table_filter="virtual_chassis",
+                table_title="Members",
+            ),
+        ]
+    )
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)
@@ -4215,10 +4340,6 @@ class VirtualChassisUIViewSet(NautobotUIViewSet):
                 }
             )
 
-        elif self.action == "retrieve":
-            members = Device.objects.restrict(request.user).filter(virtual_chassis=instance)
-            context.update({"members": members})
-
         return context
 
     def form_save(self, form, **kwargs):

nautobot/extras/filters/mixins.py

@@ -209,7 +209,7 @@ class RelationshipFilter(django_filters.ModelMultipleChoiceFilter):
         return query
 
     def filter(self, qs, value):
-        if not value or any(v in EMPTY_VALUES for v in value):
+        if not value or any(v in EMPTY_VALUES for v in value) or (hasattr(value, "exists") and not value.exists()):
             return qs
 
         query = self.generate_query(value)

nautobot/extras/forms/forms.py

@@ -144,6 +144,7 @@ __all__ = (
     "CustomLinkFilterForm",
     "CustomLinkForm",
     "DynamicGroupBulkAssignForm",
+    "DynamicGroupBulkEditForm",
     "DynamicGroupFilterForm",
     "DynamicGroupForm",
     "DynamicGroupMembershipFormSet",
@@ -704,6 +705,20 @@ class CustomLinkFilterForm(BootstrapMixin, forms.Form):
 #
 # Dynamic Groups
 #
+class DynamicGroupBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=DynamicGroup.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+    )
+
+    class Meta:
+        model = DynamicGroup
+        fields = [
+            "description",
+            "tenant",
+        ]
 
 
 class DynamicGroupForm(TenancyForm, NautobotModelForm):

nautobot/extras/models/groups.py

@@ -806,7 +806,16 @@ class DynamicGroup(PrimaryModel):
     def _get_group_queryset(self):
         """Construct the queryset representing dynamic membership of this group."""
         query = self.generate_query()
-        return self.model.objects.filter(query)
+        # https://github.com/nautobot/nautobot/issues/7631
+        #     Some queries may result in duplicate records, hence the need for `.distinct()`.
+        #     Use of `.distinct()` in general is a code smell and a performance hit, but given the wide variety of
+        #     filters that can be applied, support for both MySQL and PostgreSQL, and limitations of the Django ORM,
+        #     I don't see a clear alternative at this time.
+        #
+        #     Additionally, due to the use of `.distinct()`, in combination with our use of `.only("id")`
+        #     on this queryset, e.g. in `_set_members()`, we also need to override any default model ordering on the
+        #     queryset in order to avoid SQL errors like "each EXCEPT query must have the same number of columns"
+        return self.model.objects.filter(query).order_by("id").distinct()
 
     # TODO: unused in core
     def add_child(self, child, operator, weight):

nautobot/extras/models/jobs.py

@@ -48,7 +48,7 @@ from nautobot.extras.constants import (
 )
 from nautobot.extras.managers import JobResultManager, ScheduledJobsManager
 from nautobot.extras.models import ChangeLoggedModel, GitRepository
-from nautobot.extras.models.mixins import ContactMixin, DynamicGroupsModelMixin, NotesMixin
+from nautobot.extras.models.mixins import ContactMixin, DynamicGroupsModelMixin, NotesMixin, SavedViewMixin
 from nautobot.extras.querysets import JobQuerySet, ScheduledJobExtendedQuerySet
 from nautobot.extras.utils import (
     ChangeLoggedModelsQuery,
@@ -631,7 +631,7 @@ class JobQueueAssignment(BaseModel):
     "custom_links",
     "graphql",
 )
-class JobResult(BaseModel, CustomFieldModel):
+class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
     """
     This model stores the results from running a Job.
     """

nautobot/extras/plugins/views.py

@@ -86,10 +86,8 @@ class InstalledAppsView(GenericView):
     """
 
     table = InstalledAppsTable
-    breadcrumbs = Breadcrumbs(
-        items={"generic": [ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps")]}
-    )
-    view_titles = Titles(titles={"generic": "Installed Apps"})
+    breadcrumbs = Breadcrumbs(items={"*": [ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps")]})
+    view_titles = Titles(titles={"*": "Installed Apps"})
 
     def get(self, request):
         marketplace_data = load_marketplace_data()
@@ -129,7 +127,6 @@ class InstalledAppsView(GenericView):
                 "filter_form": None,
                 "app_icons": app_icons,
                 "display": display,
-                "view_action": "generic",
                 "breadcrumbs": self.breadcrumbs,
                 "view_titles": self.view_titles,
             },
@@ -141,6 +138,20 @@ class InstalledAppDetailView(GenericView):
     View for showing details of an installed App.
     """
 
+    breadcrumbs = Breadcrumbs(
+        items={
+            "*": [
+                ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps"),
+                ViewNameBreadcrumbItem(
+                    view_name="apps:app_detail",
+                    reverse_kwargs=lambda context: {"app": context["app_data"]["package"]},
+                    label=lambda context: context["app_data"]["name"],
+                ),
+            ]
+        }
+    )
+    view_titles = Titles(titles={"*": "{{ app_data.name | bettertitle }}"})
+
     def get(self, request, app=None, plugin=None):
         if plugin and not app:
             app = plugin
@@ -154,6 +165,8 @@ class InstalledAppDetailView(GenericView):
             {
                 "app_data": extract_app_data(app_config, load_marketplace_data()),
                 "object": app_config,
+                "breadcrumbs": self.breadcrumbs,
+                "view_titles": self.view_titles,
             },
         )
 

nautobot/extras/tables.py

@@ -736,11 +736,12 @@ class JobTable(BaseTable):
         accessor="latest_result",
         template_code="""
             {% if value %}
-                {{ value.date_created|date:settings.SHORT_DATETIME_FORMAT }} by {{ value.user }}
+                {{ value.date_created|date:SHORT_DATETIME_FORMAT }} by {{ value.user }}
             {% else %}
                 <span class="text-muted">Never</span>
             {% endif %}
         """,
+        extra_context={"SHORT_DATETIME_FORMAT": settings.SHORT_DATETIME_FORMAT},
         linkify=lambda value: value.get_absolute_url() if value else None,
     )
     last_status = tables.TemplateColumn(
@@ -906,6 +907,7 @@ class JobResultTable(BaseTable):
         linkify=True,
         verbose_name="Scheduled Job",
     )
+    duration = tables.Column(orderable=False)
     actions = ButtonsColumn(JobResult, buttons=("delete",), prepend_template=JOB_RESULT_BUTTONS)
 
     def __init__(self, *args, **kwargs):
@@ -1069,7 +1071,7 @@ class ObjectMetadataTable(BaseTable):
     )
     # This is needed so that render_value method below does not skip itself
     # when metadata_type.data_type is TYPE_CONTACT_TEAM and we need it to display either contact or team
-    value = tables.Column(empty_values=[])
+    value = tables.Column(empty_values=[], order_by=("_value",))
 
     class Meta(BaseTable.Meta):
         model = ObjectMetadata