nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/plugins/utils.py

@@ -4,7 +4,6 @@ Plugin utilities.
 
 import importlib.util
 import logging
-import sys
 
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import import_string
@@ -17,37 +16,6 @@ from .exceptions import PluginImproperlyConfigured, PluginNotFound
 logger = logging.getLogger(__name__)
 
 
-def import_object(module_and_object):
-    """
-    Import a specific object from a specific module by name, such as "nautobot.extras.plugins.utils.import_object".
-
-    Returns the imported object, or None if it doesn't exist.
-    """
-    target_module_name, object_name = module_and_object.rsplit(".", 1)
-    module_hierarchy = target_module_name.split(".")
-
-    # Iterate through the module hierarchy, checking for the existence of each successive submodule.
-    # We have to do this rather than jumping directly to calling find_spec(target_module_name)
-    # because find_spec will raise a ModuleNotFoundError if any parent module of target_module_name does not exist.
-    module_name = ""
-    for module_component in module_hierarchy:
-        module_name = f"{module_name}.{module_component}" if module_name else module_component
-        spec = importlib.util.find_spec(module_name)
-        if spec is None:
-            # No such module
-            return None
-
-    # Okay, target_module_name exists. Load it if not already loaded
-    if target_module_name in sys.modules:
-        module = sys.modules[target_module_name]
-    else:
-        module = importlib.util.module_from_spec(spec)
-        sys.modules[target_module_name] = module
-        spec.loader.exec_module(module)
-
-    return getattr(module, object_name, None)
-
-
 def load_plugins(settings):
     """Process plugins and log errors if they can't be loaded."""
     for plugin_name in settings.PLUGINS:
@@ -77,7 +45,7 @@ def load_plugin(plugin_name, settings):
     except AttributeError as err:
         raise PluginImproperlyConfigured(
             f"Plugin {plugin_name} does not provide a 'config' variable. This should be defined in the plugin's "
-            f"__init__.py file and point to the PluginConfig subclass."
+            f"__init__.py file and point to the NautobotAppConfig subclass."
         ) from err
 
     # Validate user-provided configuration settings and assign defaults. Plugin

nautobot/extras/plugins/views.py

@@ -86,7 +86,6 @@ class InstalledAppsView(GenericView):
     """
 
     table = InstalledAppsTable
-    breadcrumbs = Breadcrumbs(items={"*": [ViewNameBreadcrumbItem(view_name="apps:apps_list", label="Installed Apps")]})
     view_titles = Titles(titles={"*": "Installed Apps"})
 
     def get(self, request):
@@ -142,11 +141,6 @@ class InstalledAppDetailView(GenericView):
         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"],
-                ),
             ]
         }
     )
@@ -250,9 +244,6 @@ class MarketplaceView(GenericView):
     View for listing all available Apps.
     """
 
-    breadcrumbs = Breadcrumbs(
-        items={"generic": [ViewNameBreadcrumbItem(view_name="apps:apps_marketplace", label="Apps Marketplace")]}
-    )
     view_titles = Titles(titles={"generic": "Apps Marketplace"})
 
     def get(self, request):

nautobot/extras/querysets.py

@@ -19,6 +19,9 @@ class ConfigContextQuerySet(RestrictedQuerySet):
         # `device_type` for Device; `type` for VirtualMachine
         device_type = getattr(obj, "device_type", None)
 
+        # `device_family` for Device;
+        device_family = getattr(device_type, "device_family", None)
+
         device_redundancy_group = getattr(obj, "device_redundancy_group", None)
 
         # Get the group of the assigned tenant, if any
@@ -40,6 +43,7 @@ class ConfigContextQuerySet(RestrictedQuerySet):
             Q(locations__in=locations) | Q(locations=None),
             Q(roles=role) | Q(roles=None),
             Q(device_types=device_type) | Q(device_types=None),
+            Q(device_families=device_family) | Q(device_families=None),
             Q(platforms=obj.platform) | Q(platforms=None),
             Q(device_redundancy_groups=device_redundancy_group) | Q(device_redundancy_groups=None),
             Q(tenant_groups__in=tenant_groups) | Q(tenant_groups=None),
@@ -136,6 +140,7 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
         if self.model._meta.model_name == "device":
             location_query_string = "location"
             base_query.add((Q(device_types=OuterRef("device_type")) | Q(device_types=None)), Q.AND)
+            base_query.add((Q(device_families=OuterRef("device_type__device_family")) | Q(device_families=None)), Q.AND)
             base_query.add(
                 (Q(device_redundancy_groups=OuterRef("device_redundancy_group")) | Q(device_redundancy_groups=None)),
                 Q.AND,
@@ -145,6 +150,9 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
             base_query.add((Q(cluster_groups=OuterRef("clusters__cluster_group")) | Q(cluster_groups=None)), Q.AND)
         else:
             location_query_string = "cluster__location"
+            base_query.add(Q(device_types=None), Q.AND)
+            base_query.add(Q(device_families=None), Q.AND)
+            base_query.add(Q(device_redundancy_groups=None), Q.AND)
             # For virtual machines, handle cluster as ForeignKey relationship
             base_query.add((Q(clusters=OuterRef("cluster")) | Q(clusters=None)), Q.AND)
             base_query.add((Q(cluster_groups=OuterRef("cluster__cluster_group")) | Q(cluster_groups=None)), Q.AND)

nautobot/extras/signals.py

@@ -24,7 +24,7 @@ from nautobot.core.celery import app, import_jobs
 from nautobot.core.models import BaseModel
 from nautobot.core.utils.cache import construct_cache_key
 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,
@@ -557,24 +557,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
 #
@@ -659,6 +641,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,13 +1,13 @@
+import logging
+from textwrap import dedent
+
 from django.conf import settings
-from django.db.models import QuerySet
+from django.contrib.contenttypes.models import ContentType
 from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
-from django_tables2.data import TableData
-from django_tables2.rows import BoundRows
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
 
-from nautobot.core.models.querysets import count_related
 from nautobot.core.tables import (
     ApprovalButtonsColumn,
     BaseTable,
@@ -24,7 +24,7 @@ from nautobot.core.tables import (
 from nautobot.core.templatetags.helpers import HTML_NONE, render_boolean, render_json, render_markdown
 from nautobot.tenancy.tables import TenantColumn
 
-from .choices import LogLevelChoices, MetadataTypeDataTypeChoices
+from .choices import JobResultStatusChoices, MetadataTypeDataTypeChoices
 from .models import (
     ApprovalWorkflow,
     ApprovalWorkflowDefinition,
@@ -73,6 +73,8 @@ from .models import (
 )
 from .registry import registry
 
+logger = logging.getLogger(__name__)
+
 APPROVAL_WORKFLOW_OBJECT = """
 {% if record.object_under_review and record.object_under_review.get_absolute_url %}
     <a href="{{ record.object_under_review.get_absolute_url }}">{{ record.object_under_review }}</a>
@@ -129,7 +131,7 @@ GITREPOSITORY_BUTTONS = """
     <button
         data-url="{% url 'extras:gitrepository_sync' pk=record.pk %}"
         type="submit"
-        class="dropdown-item sync-repository{% if perms.extras.change_gitrepository %} text-primary"{% else %}" disabled="disabled"{% endif %}
+        class="dropdown-item sync-repository{% if perms.extras.change_gitrepository %} text-primary"{% else %}" disabled{% endif %}
     >
         <span class="mdi mdi-source-branch-sync" aria-hidden="true"></span>
         Sync
@@ -168,7 +170,7 @@ JOB_RESULT_BUTTONS = """
         </li>
     {% else %}
         <li>
-            <a href="#" class="dropdown-item disabled">
+            <a class="dropdown-item disabled" aria-disabled="true">
                 <span class="mdi mdi-repeat-off" aria-hidden="true"></span>
                 Job is not available, cannot be re-run
             </a>
@@ -220,7 +222,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_dry_run')"
-                class="dropdown-item{% if perms.extras.run_job and record.job_model.supports_dryrun %} text-primary"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job and record.job_model.supports_dryrun %} text-primary"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-play" aria-hidden="true"></span>
                 Dry Run
@@ -230,7 +232,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_approve')"
-                class="dropdown-item{% if perms.extras.run_job %} text-success"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job %} text-success"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-check" aria-hidden="true"></span>
                 Approve
@@ -240,7 +242,7 @@ SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
             <button
                 type="button"
                 onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_deny')"
-                class="dropdown-item{% if perms.extras.run_job %} text-danger"{% else %}" disabled="disabled"{% endif %}
+                class="dropdown-item{% if perms.extras.run_job %} text-danger"{% else %}" disabled{% endif %}
             >
                 <span class="mdi mdi-close" aria-hidden="true"></span>
                 Deny
@@ -294,7 +296,7 @@ class ApprovalWorkflowStageDefinitionTable(BaseTable):
         fields = (
             "pk",
             "approval_workflow_definition",
-            "weight",
+            "sequence",
             "name",
             "min_approvers",
             "denial_message",
@@ -303,7 +305,7 @@ class ApprovalWorkflowStageDefinitionTable(BaseTable):
         default_columns = (
             "pk",
             "approval_workflow_definition",
-            "weight",
+            "sequence",
             "name",
             "min_approvers",
             "denial_message",
@@ -1065,8 +1067,8 @@ def log_object_link(value, record):
 
 def log_entry_color_css(record):
     if record.log_level.lower() in ("failure", "error", "critical"):
-        return "danger"
-    return record.log_level.lower()
+        return "table-danger"
+    return "table-" + record.log_level.lower()
 
 
 class JobTable(BaseTable):
@@ -1159,6 +1161,7 @@ class JobTable(BaseTable):
 
 class JobHookTable(BaseTable):
     pk = ToggleColumn()
+    enabled = BooleanColumn()
     name = tables.Column(linkify=True)
     content_types = tables.TemplateColumn(WEBHOOK_CONTENT_TYPES)
     job = tables.Column(linkify=True)
@@ -1270,62 +1273,20 @@ class JobResultTable(BaseTable):
     duration = tables.Column(orderable=False)
     actions = ButtonsColumn(JobResult, buttons=("delete",), prepend_template=JOB_RESULT_BUTTONS)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Only calculate log counts for "summary" column if it's actually visible.
-        if "summary" in self.columns and self.columns["summary"].visible and isinstance(self.data.data, QuerySet):
-            self.data = TableData.from_data(
-                self.data.data.annotate(
-                    debug_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_DEBUG}
-                    ),
-                    success_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_SUCCESS}
-                    ),
-                    info_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_INFO}
-                    ),
-                    warning_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_WARNING}
-                    ),
-                    error_log_count=count_related(
-                        JobLogEntry,
-                        "job_result",
-                        filter_dict={
-                            "log_level__in": [
-                                LogLevelChoices.LOG_FAILURE,
-                                LogLevelChoices.LOG_ERROR,
-                                LogLevelChoices.LOG_CRITICAL,
-                            ],
-                        },
-                    ),
-                )
-            )
-            self.data.set_table(self)
-            self.rows = BoundRows(data=self.data, table=self, pinned_data=self.pinned_data)
-
     def render_summary(self, record):
         """
         Define custom rendering for the summary column.
         """
-        # Normally the *_log_count attributes will be generated efficiently via queryset annotation in the view,
-        # however, we cannot assume that will always be the case. Calculate them inefficiently as a fallback.
-        if not hasattr(record, "debug_log_count"):
-            record.debug_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_DEBUG).count()
-        if not hasattr(record, "success_log_count"):
-            record.success_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_SUCCESS).count()
-        if not hasattr(record, "info_log_count"):
-            record.info_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_INFO).count()
-        if not hasattr(record, "warning_log_count"):
-            record.warning_log_count = record.job_log_entries.filter(log_level=LogLevelChoices.LOG_WARNING).count()
-        if not hasattr(record, "error_log_count"):
-            record.error_log_count = record.job_log_entries.filter(
-                log_level__in=[
-                    LogLevelChoices.LOG_FAILURE,
-                    LogLevelChoices.LOG_ERROR,
-                    LogLevelChoices.LOG_CRITICAL,
-                ]
-            ).count()
+        # The *_log_count attributes will be calculated and updated at the end of a Job run when JobResult is saved.
+        # If the values are not present due to a running Job or are missing in any field, skip display.
+        if record.status not in JobResultStatusChoices.READY_STATES or None in [
+            record.debug_log_count,
+            record.success_log_count,
+            record.info_log_count,
+            record.warning_log_count,
+            record.error_log_count,
+        ]:
+            return ""
 
         return format_html(
             """<label class="badge bg-secondary">{}</label>
@@ -1364,6 +1325,7 @@ class JobResultTable(BaseTable):
             "job_model",
             "user",
             "status",
+            "summary",
             "actions",
         )
 
@@ -1517,12 +1479,20 @@ class ScheduledJobTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
     job_model = tables.Column(verbose_name="Job", linkify=True)
+    enabled = BooleanColumn()
     interval = tables.Column(verbose_name="Execution Type")
     start_time = tables.DateTimeColumn(verbose_name="First Run", format=settings.SHORT_DATETIME_FORMAT)
     last_run_at = tables.DateTimeColumn(verbose_name="Most Recent Run", format=settings.SHORT_DATETIME_FORMAT)
     crontab = tables.Column()
     total_run_count = tables.Column(verbose_name="Total Run Count")
     actions = ButtonsColumn(ScheduledJob, buttons=("delete",), prepend_template=SCHEDULED_JOB_BUTTONS)
+    approval_state = tables.Column(empty_values=[], orderable=False)
+
+    def render_approval_state(self, record):
+        workflow = record.associated_approval_workflows.first()
+        if workflow is not None:
+            return format_html('<a href="{}">{}</a>', record.get_approval_workflow_url(), workflow.current_state)
+        return HTML_NONE
 
     class Meta(BaseTable.Meta):
         model = ScheduledJob
@@ -1531,6 +1501,7 @@ class ScheduledJobTable(BaseTable):
             "name",
             "total_run_count",
             "job_model",
+            "approval_state",
             "interval",
             "start_time",
             "last_run_at",
@@ -1542,6 +1513,8 @@ class ScheduledJobTable(BaseTable):
             "pk",
             "name",
             "job_model",
+            "enabled",
+            "approval_state",
             "interval",
             "last_run_at",
             "actions",
@@ -1588,8 +1561,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/django_ajax_tables/ajax_wrapper.html

@@ -38,6 +38,8 @@ Ref: https://github.com/nautobot/nautobot/issues/1289
 
                     _replace_links_{{ ajax_divname }}(url, div.getElementsByTagName('TH'));
                     _replace_links_{{ ajax_divname }}(url, div.getElementsByClassName('pagination'));
+                    /* Hook back up the JS for the "per_page" dropdown, if present for this table */
+                    initializeResultPerPageSelection(div);
                 }
             }
         };

nautobot/extras/templates/extras/approval_dashboard.html

@@ -2,12 +2,14 @@
 {% load helpers %}
 
 {% block buttons %}
-    <div class="btn-group">
-        <a class="btn {% if approval_view %}btn-primary{% else %}btn-secondary{% endif %}" href="{% url 'extras:approver_dashboard' %}">
-            My Approvals
+    <div class="btn-group" role="group">
+        <a class="btn btn-primary{% if approval_view %} bg-primary nb-text-body-bg{% endif %}"
+           href="{% url 'extras:approver_dashboard' %}">
+            <span class="mdi mdi-checkbox-multiple-outline" aria-hidden="true"></span> My Approvals
         </a>
-        <a class="btn {% if not approval_view %}btn-primary{% else %}btn-secondary{% endif %}" href="{% url 'extras:approvee_dashboard' %}">
-            My Requests
+        <a class="btn btn-primary{% if not approval_view %} bg-primary nb-text-body-bg{% endif %}"
+           href="{% url 'extras:approvee_dashboard' %}">
+            <span class="mdi mdi-help-box-multiple-outline" aria-hidden="true"></span> My Requests
         </a>
     </div>
 {% endblock %}

nautobot/extras/templates/extras/approvalworkflowdefinition_update.html

@@ -9,7 +9,7 @@
             {% render_field form.name %}
             {% render_field form.model_content_type %}
             {% render_field form.model_constraints %}
-            {% render_field form.priority %}
+            {% render_field form.weight %}
         </div>
     </div>
     <div class="card">
@@ -22,7 +22,9 @@
                         <thead>
                             <tr>
                                 {% for field in stage.visible_fields %}
-                                    <th>{{ field.label|capfirst }}</th>
+                                    <th>
+                                        <span data-bs-toggle="tooltip" data-bs-placement="top" title="{{ field.help_text }}">{{ field.label|capfirst }}</span>
+                                    </th>
                                 {% endfor %}
                             </tr>
                         </thead>

nautobot/extras/templates/extras/approvalworkflowstage_retrieve.html

@@ -3,19 +3,27 @@
 
 {% block buttons %}
     <span title="{% if not object.is_active_stage %}This stage is not active{% elif request.user in object.users_that_already_approved %}You already approved this stage{% else %}Approve this stage{% endif %}">
-        <a
-            href="{% url 'extras:approvalworkflowstage_approve' object.pk %}?return_url={{request.path}}"
-            class="btn btn-success{% if not object.is_active_stage or request.user in object.users_that_already_approved %} disabled{% endif %}"
-        >
-            <span class="mdi mdi-check"></span> Approve
-        </a>
+        {% if object.is_active_stage and request.user not in object.users_that_already_approved %}
+            <a href="{% url 'extras:approvalworkflowstage_approve' object.pk %}?return_url={{request.path}}"
+               class="btn btn-success">
+                <span class="mdi mdi-check"></span> Approve
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-success disabled">
+                <span class="mdi mdi-check"></span> Approve
+            </a>
+        {% endif %}
     </span>
     <span title="{% if not object.is_active_stage %}This stage is not active{% elif request.user in object.users_that_already_approved %}You already approved this stage{% else %}Deny this stage{% endif %}">
-        <a
-            href="{% url 'extras:approvalworkflowstage_deny' object.pk %}?return_url={{request.path}}"
-            class="btn btn-danger {% if not object.is_active_stage or request.user in object.users_that_already_approved %} disabled{% endif %}"
-        >
-            <span class="mdi mdi-close"></span> Deny
-        </a>
+        {% if object.is_active_stage and request.user not in object.users_that_already_approved %}
+            <a href="{% url 'extras:approvalworkflowstage_deny' object.pk %}?return_url={{request.path}}"
+               class="btn btn-danger">
+                <span class="mdi mdi-close"></span> Deny
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-danger disabled">
+                <span class="mdi mdi-close"></span> Deny
+            </a>
+        {% endif %}
     </span>
 {% endblock buttons %}

nautobot/extras/templates/extras/configcontext_update.html

@@ -18,6 +18,7 @@
             {% render_field form.locations %}
             {% render_field form.roles %}
             {% render_field form.device_types %}
+            {% render_field form.device_families %}
             {% render_field form.platforms %}
             {% render_field form.cluster_groups %}
             {% render_field form.clusters %}

nautobot/extras/templates/extras/configcontextschema_validation.html

@@ -1,6 +1,6 @@
-{% extends 'extras/configcontextschema.html' %}
+{% extends 'extras/configcontextschema_retrieve.html' %}
 
-<h1>{% block title %}{{ object }} - Validation{% endblock %}</h1>
+{% block title %}{{ object }} - Validation{% endblock %}
 
 {% block content %}
     <div class="row">

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-lg-12">
+        <div class="row">
+            <div class="col-lg-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-lg-12">
                 {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Dynamic Group members' %}

nautobot/extras/templates/extras/dynamicgroup_update.html

@@ -43,7 +43,7 @@
             <div class="tab-content">
                 <div class="tab-pane active" id="filter-form">
                     {% if filter_form %}
-                        <span class="form-text">
+                        <span class="form-text mb-12">
                             Select the filtering criteria to determine membership of objects matching
                             the Content Type for this Dynamic Group. Fields that are not a dropdown are
                             expected to have string inputs and do not support multiple values.

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-lg-12">

nautobot/extras/templates/extras/inc/approval_buttons_column.html

@@ -10,15 +10,29 @@
 {% endif %}
 {% if "approve" in buttons and have_permission and record.is_active_stage %}
     <span title='{% if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Approve this stage{% endif %}'>
-        <a href="{% url approval_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}" class="btn btn-success btn-sm{% if request.user in record.users_that_already_approved %} disabled{% endif %}">
-            <span class="mdi mdi-check"></span>
-        </a>
+        {% if request.user not in record.users_that_already_approved %}
+            <a href="{% url approval_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}"
+               class="btn btn-success btn-sm">
+                <span class="mdi mdi-check"></span>
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-success btn-sm disabled">
+                <span class="mdi mdi-check"></span>
+            </a>
+        {% endif %}
     </span>
 {% endif %}
 {% if "deny" in buttons and have_permission and record.is_active_stage and request.user not in record.users_that_already_approved %}
     <span title='{%if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Deny this stage{% endif %}'>
-        <a href="{% url deny_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}" class="btn btn-sm btn-danger {% if request.user in record.users_that_already_approved %} disabled{% endif %}">
-            <span class="mdi mdi-close"></span>
-        </a>
+        {% if request.user not in record.users_that_already_approved %}
+            <a href="{% url deny_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}"
+               class="btn btn-danger btn-sm">
+                <span class="mdi mdi-close"></span>
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-danger btn-sm disabled">
+                <span class="mdi mdi-close"></span>
+            </a>
+        {% endif %}
     </span>
 {% endif %}