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

nautobot/dcim/views.py

@@ -1,5 +1,6 @@
 from collections import OrderedDict
 from copy import deepcopy
+from functools import partial
 import logging
 import re
 import uuid
@@ -20,7 +21,7 @@ from django.template import Context
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.encoding import iri_to_uri
-from django.utils.html import format_html, mark_safe
+from django.utils.html import format_html, format_html_join, mark_safe
 from django.utils.http import url_has_allowed_host_and_scheme, urlencode
 from django.views.generic import View
 from django_tables2 import RequestConfig
@@ -278,6 +279,106 @@ class LocationTypeUIViewSet(NautobotUIViewSet):
 #
 
 
+class LocationGeographicalInfoFieldsPanel(object_detail.ObjectFieldsPanel):
+    def get_data(self, context):
+        data = super().get_data(context)
+        obj = get_obj_from_context(context, self.context_object_key)
+
+        if obj and obj.latitude and obj.longitude:
+            data["GPS Coordinates"] = f"{obj.latitude}, {obj.longitude}"
+        else:
+            data["GPS Coordinates"] = None
+
+        return data
+
+    def render_value(self, key, value, context):
+        if key == "GPS Coordinates":
+            if value is not None:
+                return helpers.render_address(value)
+            return helpers.HTML_NONE
+
+        return super().render_value(key, value, context)
+
+
+class LocationRackGroupsPanel(object_detail.Panel):
+    def render_rack_row(self, indent_px, url, name, count, elevation_url):
+        """Render a single <tr> for a rack group or summary row."""
+        return format_html(
+            """
+            <tr>
+                <td style="padding-left: {}px">
+                    <i class="mdi mdi-folder-open"></i>
+                    <a href="{}">{}</a>
+                </td>
+                <td>{}</td>
+                <td class="text-right noprint">
+                    <a href="{}" class="btn btn-xs btn-primary" title="View elevations">
+                        <i class="mdi mdi-server"></i>
+                    </a>
+                </td>
+            </tr>
+            """,
+            indent_px,
+            url,
+            name,
+            count,
+            elevation_url,
+        )
+
+    def render_body_content(self, context):
+        """Render the <tbody> content for the Rack Groups table."""
+        obj = get_obj_from_context(context)
+        if not obj:
+            return ""
+
+        rack_groups = context.get("rack_groups", [])
+        rack_count = context.get("rack_count", 0)
+
+        rows = []
+
+        # Render each rack group row
+        for rack_group in rack_groups:
+            rows.append(
+                self.render_rack_row(
+                    getattr(rack_group, "tree_depth", 0) * 8,
+                    rack_group.get_absolute_url(),
+                    str(rack_group),
+                    rack_group.rack_count,
+                    f"{reverse('dcim:rack_elevation_list')}?rack_group={rack_group.pk}",
+                )
+            )
+
+        # Add "All racks" row
+        rows.append(
+            self.render_rack_row(
+                10,
+                "#",
+                "All racks",
+                rack_count,
+                f"{reverse('dcim:rack_elevation_list')}?location={obj.pk}",
+            )
+        )
+
+        return format_html_join("", "{}", ((row,) for row in rows))
+
+
+class LocationImageAttachmentsTablePanel(object_detail.ObjectsTablePanel):
+    """
+    ObjectsTablePanel with a custom _get_table_add_url() implementation.
+
+    Needed because the URL is `/dcim/devices/<pk>/images/add/`, not `extras/image-attachments/add?location=<pk>`.
+    """
+
+    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_perms(["extras.add_imageattachment"]):
+            return None
+        return reverse("dcim:location_add_image", kwargs={"object_id": obj.pk}) + f"?return_url={return_url}"
+
+
 class LocationUIViewSet(NautobotUIViewSet):
     # We are only accessing the tree fields from the list view, where `with_tree_fields` is called dynamically
     # depending on whether the hierarchy is shown in the UI (note that `parent` itself is a normal foreign key, not a
@@ -292,70 +393,116 @@ class LocationUIViewSet(NautobotUIViewSet):
     bulk_update_form_class = forms.LocationBulkEditForm
     serializer_class = serializers.LocationSerializer
     breadcrumbs = AncestorsBreadcrumbs(detail_item_label=context_object_attr("name"))
+    view_titles = Titles(titles={"detail": "{{ object.name }}"})
+
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "location_type",
+                    "status",
+                    "parent",
+                    "tenant",
+                    "facility",
+                    "asn",
+                    "time_zone",
+                    "description",
+                ],
+                value_transforms={
+                    "location_type": [partial(helpers.hyperlinked_object, field="name")],
+                    "time_zone": [helpers.format_timezone],
+                },
+                key_transforms={
+                    "asn": "AS Number",
+                },
+            ),
+            LocationGeographicalInfoFieldsPanel(
+                weight=110,
+                section=SectionChoices.LEFT_HALF,
+                label="Geographical Info",
+                fields=[
+                    "physical_address",
+                    "shipping_address",
+                ],
+                value_transforms={
+                    "physical_address": [helpers.render_address],
+                    "shipping_address": [helpers.render_address],
+                },
+            ),
+            object_detail.ObjectFieldsPanel(
+                weight=120,
+                section=SectionChoices.LEFT_HALF,
+                label="Contact Info",
+                fields=["contact_name", "contact_phone", "contact_email"],
+                value_transforms={
+                    "contact_phone": [helpers.hyperlinked_phone_number],
+                    "contact_email": [helpers.hyperlinked_email],
+                },
+                footer_content_template_path="dcim/footer_convert_to_contact_or_team_record.html",
+            ),
+            object_detail.StatsPanel(
+                weight=100,
+                label="Stats",
+                section=SectionChoices.RIGHT_HALF,
+                filter_name="location",
+                related_models=[
+                    Rack,
+                    Device,
+                    Prefix,
+                    VLAN,
+                    (Circuit, "circuit_terminations__location__in"),
+                    (VirtualMachine, "cluster__location__in"),
+                ],
+            ),
+            LocationRackGroupsPanel(
+                label="Rack Groups",
+                section=SectionChoices.RIGHT_HALF,
+                weight=200,
+                body_wrapper_template_path="components/panel/body_wrapper_generic_table.html",
+            ),
+            LocationImageAttachmentsTablePanel(
+                weight=300,
+                section=SectionChoices.RIGHT_HALF,
+                table_title="Images",
+                table_class=ImageAttachmentTable,
+                table_attribute="images",
+                related_field_name="location",
+                show_table_config_button=False,
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.FULL_WIDTH,
+                weight=100,
+                table_title="Children",
+                table_class=tables.LocationTable,
+                table_attribute="children",
+                related_field_name="parent",
+                order_by_fields=["name"],
+                hide_hierarchy_ui=True,
+            ),
+        )
+    )
 
     def get_extra_context(self, request, instance):
         if instance is None:
             return super().get_extra_context(request, instance)
+
         # This query can get really expensive when there are big location trees in the DB. By casting it to a list we
         # ensure it is only performed once rather than as a subquery for each of the different count stats.
         related_locations = list(
             instance.descendants(include_self=True).restrict(request.user, "view").values_list("pk", flat=True)
         )
-        prefix_count_queryset = Prefix.objects.restrict(request.user, "view").filter(locations__in=related_locations)
-        vlan_count_queryset = VLAN.objects.restrict(request.user, "view").filter(locations__in=related_locations)
-        circuit_count_queryset = Circuit.objects.restrict(request.user, "view").filter(
-            circuit_terminations__location__in=related_locations
-        )
-        # When there is more than one location, the models that can be assigned to more then one location at the same
-        # time need to be queried with `distinct`. We are avoiding `distinct` when this is not the case, as it incurs
-        # a performance penalty.
-        if len(related_locations) > 1:
-            prefix_count_queryset = prefix_count_queryset.distinct()
-            vlan_count_queryset = vlan_count_queryset.distinct()
-            circuit_count_queryset = circuit_count_queryset.distinct()
-        stats = {
-            "prefix_count": prefix_count_queryset.count(),
-            "vlan_count": vlan_count_queryset.count(),
-            "circuit_count": circuit_count_queryset.count(),
-            "rack_count": Rack.objects.restrict(request.user, "view").filter(location__in=related_locations).count(),
-            "device_count": Device.objects.restrict(request.user, "view")
-            .filter(location__in=related_locations)
-            .count(),
-            "vm_count": VirtualMachine.objects.restrict(request.user, "view")
-            .filter(cluster__location__in=related_locations)
-            .count(),
-        }
+
         rack_groups = (
             RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group"))
             .restrict(request.user, "view")
             .filter(location__in=related_locations)
         )
-        children = (
-            Location.objects.restrict(request.user, "view")
-            # We aren't accessing tree fields anywhere so this is safe (note that `parent` itself is a normal foreign
-            # key, not a tree field). If we ever do access tree fields, this will perform worse, because django will
-            # automatically issue a second query (similar to behavior for
-            # https://docs.djangoproject.com/en/3.2/ref/models/querysets/#django.db.models.query.QuerySet.only)
-            .without_tree_fields()
-            .filter(parent=instance)
-            .select_related("parent", "location_type")
-        )
-
-        children_table = tables.LocationTable(children, hide_hierarchy_ui=True)
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(children_table)
 
         return {
-            "children_table": children_table,
             "rack_groups": rack_groups,
-            "stats": stats,
-            "contact_association_permission": ["extras.add_contactassociation"],
-            # show the button if any of these fields have non-empty value.
-            "show_convert_to_contact_button": instance.contact_name or instance.contact_phone or instance.contact_email,
-            **super().get_extra_context(request, instance),
+            "rack_count": Rack.objects.restrict(request.user, "view").filter(location__in=related_locations).count(),
         }
 
 
@@ -2182,34 +2329,6 @@ class DeviceUIViewSet(NautobotUIViewSet):
         Override base ObjectDetailContent to render dynamic-groups table as a separate view/tab instead of inline.
         """
 
-        class DeviceDynamicGroupsTextPanel(object_detail.BaseTextPanel):
-            """Panel displaying a note about caching of dynamic groups."""
-
-            def __init__(
-                self,
-                *,
-                weight,
-                render_as=object_detail.BaseTextPanel.RenderOptions.MARKDOWN,
-                label="Dynamic Group caching",
-                **kwargs,
-            ):
-                super().__init__(weight=weight, render_as=render_as, label=label, **kwargs)
-
-            def get_value(self, context):
-                dg_list_url = reverse("extras:dynamicgroup_list")
-                job_run_url = reverse(
-                    "extras:job_run_by_class_path",
-                    kwargs={"class_path": "nautobot.core.jobs.groups.RefreshDynamicGroupCaches"},
-                )
-                return (
-                    "Dynamic group membership is cached for performance reasons, "
-                    "therefore this page may not always be up-to-date.\n\n"
-                    "You can refresh the membership of any specific group by viewing it from the list below or from the "
-                    f"[Dynamic Groups list view]({dg_list_url}).\n\n"
-                    "You can also refresh the membership of **all** groups by running the "
-                    f"[Refresh Dynamic Group Caches job]({job_run_url})."
-                )
-
         def __init__(self, **kwargs):
             super().__init__(**kwargs)
             # Remove inline tab definition
@@ -2225,7 +2344,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
                     url_name="dcim:device_dynamicgroups",
                     related_object_attribute="dynamic_groups",
                     panels=(
-                        self.DeviceDynamicGroupsTextPanel(weight=100),
+                        object_detail.DynamicGroupsTextPanel(weight=100),
                         object_detail.ObjectsTablePanel(
                             weight=200,
                             table_class=DynamicGroupTable,
@@ -2312,11 +2431,11 @@ class DeviceUIViewSet(NautobotUIViewSet):
             for powerport in instance.all_power_ports.all():
                 utilization = powerport.get_power_draw()
                 # Table row for each power-port
-                powerfeed = powerport.connected_endpoint
-                if powerfeed is not None and powerfeed.available_power:
-                    available_power = powerfeed.available_power
+                connected_endpoint = powerport.connected_endpoint
+                if isinstance(connected_endpoint, PowerFeed) and connected_endpoint.available_power:
+                    available_power = connected_endpoint.available_power
                     utilization_data = Context(
-                        helpers.utilization_graph_raw_data(utilization["allocated"], powerfeed.available_power)
+                        helpers.utilization_graph_raw_data(utilization["allocated"], connected_endpoint.available_power)
                     )
                     utilization_graph = object_detail.render_component_template(
                         "utilities/templatetags/utilization_graph.html", utilization_data
@@ -2335,13 +2454,10 @@ class DeviceUIViewSet(NautobotUIViewSet):
 
                 # Indented table row for each leg of a three-phase power-port.
                 for leg in utilization["legs"]:
-                    if powerfeed is not None and powerfeed.available_power:
-                        available_power = powerfeed.available_power / 3
+                    if isinstance(connected_endpoint, PowerFeed) and connected_endpoint.available_power:
+                        available_power = connected_endpoint.available_power / 3
                         utilization_data = Context(
-                            helpers.utilization_graph_raw_data(leg["allocated"], powerfeed.available_power / 3)
-                        )
-                        utilization_graph = object_detail.render_component_template(
-                            "utilities/templatetags/utilization_graph.html", utilization_data
+                            helpers.utilization_graph_raw_data(leg["allocated"], connected_endpoint.available_power / 3)
                         )
                     else:
                         available_power = helpers.HTML_NONE

nautobot/extras/api/views.py

@@ -911,7 +911,15 @@ class JobButtonViewSet(NotesViewSetMixin, ModelViewSet):
 #
 
 
-class ScheduledJobViewSet(ReadOnlyModelViewSet):
+class ScheduledJobViewSet(
+    # DRF mixins:
+    # note no CreateModelMixin or UpdateModelMixin
+    mixins.DestroyModelMixin,
+    # Nautobot mixins:
+    BulkDestroyModelMixin,
+    # Base class
+    ReadOnlyModelViewSet,
+):
     """
     Retrieve a list of scheduled jobs
     """

nautobot/extras/filters/customfields.py

@@ -1,3 +1,6 @@
+from functools import reduce
+import operator
+
 from django.db.models import Q
 from django.forms import IntegerField
 import django_filters
@@ -47,7 +50,10 @@ class CustomFieldFilterMixin:
         if value == "null" or value == ["null"]:
             return Q(**{f"{self.field_name}__exact": None}) & Q(**{f"{self.field_name}__isnull": False})
 
-        value_match = Q(**{f"{self.field_name}__{self.lookup_expr}": value})
+        if isinstance(value, (list, tuple)):
+            value_match = reduce(operator.or_, [Q(**{f"{self.field_name}__{self.lookup_expr}": v}) for v in value])
+        else:
+            value_match = Q(**{f"{self.field_name}__{self.lookup_expr}": value})
         value_is_not_none = ~Q(**{f"{self.field_name}__exact": None})
         key_is_present_in_jsonb = Q(
             **{f"{self.field_name}__isnull": False}
@@ -88,7 +94,7 @@ class CustomFieldBooleanFilter(CustomFieldFilterMixin, django_filters.BooleanFil
     """Custom field single value filter for backwards compatibility"""
 
 
-class CustomFieldCharFilter(CustomFieldFilterMixin, django_filters.Filter):
+class CustomFieldCharFilter(CustomFieldFilterMixin, django_filters.CharFilter):
     """Custom field single value filter for backwards compatibility"""
 
 
@@ -122,7 +128,7 @@ class CustomFieldMultiSelectFilter(CustomFieldSelectFilter):
         super().__init__(*args, **kwargs)
 
 
-class CustomFieldNumberFilter(CustomFieldFilterMixin, django_filters.Filter):
+class CustomFieldNumberFilter(CustomFieldFilterMixin, django_filters.NumberFilter):
     """Custom field single value filter for backwards compatibility"""
 
     field_class = IntegerField

nautobot/extras/models/groups.py

@@ -628,6 +628,10 @@ class DynamicGroup(PrimaryModel):
         else:
             # Validate against the filterset's internal form validation.
             filterset = self.filterset_class(self.filter)  # pylint: disable=not-callable
+            # TODO: the below is more generous than one might expect. For example, passing a list of strings ["foo"]
+            # to a (single-input) CharFilter will quietly normalize the list to a string '["foo"]' instead of reporting
+            # any failure of is_valid(). We've had cases of such "should be invalid but isn't caught" DynamicGroups causing
+            # exceptions when trying to evaluate their membership; it would be good to be stricter here instead!
             if not filterset.is_valid():
                 raise ValidationError(filterset.errors)
 
@@ -661,6 +665,22 @@ class DynamicGroup(PrimaryModel):
 
             # TODO limit most changes to self.group_type as well.
 
+    def save(self, *args, update_cached_members=True, **kwargs):
+        """
+        Save the DynamicGroup record.
+
+        Args:
+            update_cached_members (bool): If True, (re)calculate the cached members set of the related group(s) immediately.
+                Note that this is potentially quite expensive if there will be a large change in the members set!
+                If False (recommended), you can call `self.update_cached_members()` explicitly when ready.
+        """
+        super().save(*args, **kwargs)
+
+        if update_cached_members:
+            self.update_cached_members()
+            for ancestor in self.get_ancestors():
+                ancestor.update_cached_members()
+
     def _generate_query_for_filter(self, filter_field, value):
         """
         Return a `Q` object generated from a `filter_field` and `value`.
@@ -703,9 +723,12 @@ class DynamicGroup(PrimaryModel):
             # "ams02"]}`, the value being a list of location names (`["ams01", "ams02"]`).
             if value and isinstance(value, list) and isinstance(value[0], str) and not is_uuid(value[0]):
                 model_field = django_filters.utils.get_model_field(self._model, filter_field.field_name)
-                related_model = model_field.related_model
-                lookup_kwargs = {f"{to_field_name}__in": value}
-                gq_value = related_model.objects.filter(**lookup_kwargs)
+                if model_field is None:
+                    gq_value = value
+                else:
+                    related_model = model_field.related_model
+                    lookup_kwargs = {f"{to_field_name}__in": value}
+                    gq_value = related_model.objects.filter(**lookup_kwargs)
             else:
                 gq_value = value
             query |= filter_field.generate_query(gq_value)
@@ -1172,12 +1195,26 @@ class DynamicGroupMembership(BaseModel):
         if self.group in self.parent_group.get_ancestors():
             raise ValidationError({"group": "Cannot add ancestor as a child"})
 
-    def save(self, *args, **kwargs):
+    def save(self, *args, update_cached_members=True, **kwargs):
+        """
+        Save the DynamicGroupMembership record.
+
+        Args:
+            update_cached_members (bool): If True, (re)calculate the cached members set of the related group(s) immediately.
+                Note that this is potentially quite expensive if there will be a large change in the members set!
+                If False (recommended), you can call `self.parent_group.update_cached_members()` explicitly when ready.
+        """
         # For backwards compatibility
         if self.parent_group.group_type == DynamicGroupTypeChoices.TYPE_DYNAMIC_FILTER and not self.parent_group.filter:
             self.parent_group.group_type = DynamicGroupTypeChoices.TYPE_DYNAMIC_SET
             self.parent_group.save()
-        return super().save(*args, **kwargs)
+
+        super().save(*args, **kwargs)
+
+        if update_cached_members:
+            self.parent_group.update_cached_members()
+            for ancestor in self.parent_group.get_ancestors():
+                ancestor.update_cached_members()
 
 
 class StaticGroupAssociationManager(BaseManager.from_queryset(RestrictedQuerySet)):

nautobot/extras/signals.py

@@ -23,7 +23,7 @@ import redis.exceptions
 from nautobot.core.celery import app, import_jobs
 from nautobot.core.models import BaseModel
 from nautobot.core.utils.logging import sanitize
-from nautobot.extras.choices import JobResultStatusChoices, ObjectChangeActionChoices
+from nautobot.extras.choices import ButtonClassChoices, JobResultStatusChoices, ObjectChangeActionChoices
 from nautobot.extras.constants import CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL
 from nautobot.extras.models import (
     ComputedField,
@@ -542,24 +542,6 @@ m2m_changed.connect(dynamic_group_children_changed, sender=DynamicGroup.children
 pre_save.connect(dynamic_group_membership_created, sender=DynamicGroupMembership)
 
 
-def dynamic_group_update_cached_members(sender, instance, **kwargs):
-    """
-    When a DynamicGroup or DynamicGroupMembership is updated, update the cache of members for it and any parent groups.
-    """
-    if isinstance(instance, DynamicGroupMembership):
-        group = instance.parent_group
-    else:
-        group = instance
-
-    group.update_cached_members()
-    for ancestor in group.get_ancestors():
-        ancestor.update_cached_members()
-
-
-post_save.connect(dynamic_group_update_cached_members, sender=DynamicGroup)
-post_save.connect(dynamic_group_update_cached_members, sender=DynamicGroupMembership)
-
-
 #
 # Jobs
 #
@@ -644,6 +626,25 @@ def refresh_job_models(sender, *, apps, **kwargs):
             job_model.installed = False
             job_model.save()
 
+    # Wire up the JobButton for Dynamic Group member refresh
+    JobButton = apps.get_model("extras", "JobButton")
+    ContentType = apps.get_model("contenttypes", "ContentType")  # pylint: disable=redefined-outer-name
+    DynamicGroup = apps.get_model("extras", "DynamicGroup")  # pylint: disable=redefined-outer-name
+
+    dg_job_button, _ = JobButton.objects.get_or_create(
+        name="Refresh Dynamic Group Members Cache",
+        job=Job.objects.get(
+            module_name="nautobot.core.jobs.groups", job_class_name="RefreshDynamicGroupCacheJobButtonReceiver"
+        ),
+        defaults={
+            "enabled": True,
+            "text": "Refresh Members",
+            "button_class": ButtonClassChoices.CLASS_WARNING,
+            "confirmation": True,
+        },
+    )
+    dg_job_button.content_types.add(ContentType.objects.get_for_model(DynamicGroup))
+
 
 #
 # Metadata

nautobot/extras/tables.py

@@ -1,4 +1,8 @@
+import logging
+from textwrap import dedent
+
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import QuerySet
 from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
@@ -67,6 +71,8 @@ from .models import (
 )
 from .registry import registry
 
+logger = logging.getLogger(__name__)
+
 ASSIGNED_OBJECT = """
 {% load helpers %}
 {{ record.assigned_object|hyperlinked_object }}
@@ -1222,8 +1228,31 @@ class ObjectChangeTable(BaseTable):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # The `object_repr` column also uses the `changed_object` generic-foreign-key value
-        self.add_conditional_prefetch("object_repr", "changed_object")
+        # Only prefetch if all content types are valid
+        if all(ct.model_class() is not None for ct in ContentType.objects.all()):
+            self.add_conditional_prefetch("object_repr", "changed_object")
+        else:
+            error_message = dedent("""\
+                            One or more ContentType entries in the database are invalid.
+                            This will likely cause performance degradation when viewing the Object Change log.
+                            An administrator can follow these steps to resolve common issues:
+                             - Run `nautobot-server remove_stale_contenttypes`
+                             - Run `nautobot-server migrate <app_label> zero` for any app labels which no longer exist
+                             - Manually dropping tables for any models which have been removed from Nautobot or its plugins from your database
+                             - Run ```
+                                    from django.contrib.contenttypes.models import ContentType
+                                    qs = ContentType.objects.filter(
+                                        app_label__in=[
+                                            "<app_label_of_removed_plugin_1>",
+                                            "<app_label_of_removed_plugin_2>",
+                                        ]
+                                    ) | ContentType.objects.filter(model__icontains="<name_of_removed_model_1>")
+                                    # Review the queryset before running delete
+                                    qs.delete()
+                                   ```
+                            Please ensure you fully understand the implications of these actions before proceeding.
+                            """)
+            logger.warning(error_message)
 
 
 #

nautobot/extras/templates/extras/computedfield.html

@@ -1,2 +1,2 @@
-{% extends 'extras/computedfield_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/configcontext.html

@@ -1,2 +1,2 @@
-{% extends 'extras/configcontext_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/configcontextschema_validation.html

@@ -1,4 +1,4 @@
-{% extends 'extras/configcontextschema.html' %}
+{% extends 'extras/configcontextschema_retrieve.html' %}
 
 <h1>{% block title %}{{ object }} - Validation{% endblock %}</h1>
 

nautobot/extras/templates/extras/customfield.html

@@ -1,2 +1,2 @@
-{% extends 'extras/customfield_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/dynamicgroup_retrieve.html

@@ -11,15 +11,21 @@
 
 {% block extra_tab_content %}
     <div id="members" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "members" %}active{% else %}fade{% endif %}">
-        {% if members_list_url %}
-            <div class="row">
-                <div class="col-md-12">
+        <div class="row">
+            <div class="col-md-12">
+                {% if members_list_url %}
                     <div class="alert alert-success" role="alert">
                         You can bulk-add and bulk-remove members of this group from the <a href="{{ members_list_url }}">{{ members_verbose_name_plural|bettertitle }} list view</a>.
                     </div>
-                </div>
+                {% else %}
+                    <div class="alert alert-warning" role="alert">
+                        Dynamic group membership is cached for performance reasons, therefore this listing may not always
+                        be up-to-date.<br>You can refresh the membership of this group asynchronously by clicking the
+                        "Refresh Members" button above.
+                    </div>
+                {% endif %}
             </div>
-        {% endif %}
+        </div>
         <div class="row">
             <div class="col-md-12">
                 {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Dynamic Group members' %}

nautobot/extras/templates/extras/gitrepository_result.html

@@ -3,8 +3,6 @@
 {% load log_levels %}
 {% load static %}
 
-{% block title %}{{ block.super }} - Synchronization Status{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-md-12">