nautobot 3.0.0rc1__py3-none-any.whl → 3.0.1__py3-none-any.whl

nautobot/extras/migrations/0132_approval_workflow_seed_data.py

@@ -0,0 +1,127 @@
+# Generated by Django 4.2.25 on 2025-11-11 04:24
+
+from django.db import migrations
+
+
+def create_default_scheduledjob_workflow(apps, schema_editor):
+    Group = apps.get_model("auth", "Group")
+    ObjectPermission = apps.get_model("users", "ObjectPermission")
+    ApprovalWorkflow = apps.get_model("extras", "ApprovalWorkflow")
+    ApprovalWorkflowStage = apps.get_model("extras", "ApprovalWorkflowStage")
+    ApprovalWorkflowStageResponse = apps.get_model("extras", "ApprovalWorkflowStageResponse")
+    ApprovalWorkflowDefinition = apps.get_model("extras", "ApprovalWorkflowDefinition")
+    ApprovalWorkflowStageDefinition = apps.get_model("extras", "ApprovalWorkflowStageDefinition")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    ScheduledJob = apps.get_model("extras", "ScheduledJob")
+
+    # --- Groups ---
+    groups = {
+        "nautobot-default-scheduledjob-approver": Group.objects.get_or_create(
+            name="nautobot-default-scheduledjob-approver"
+        )[0],
+        "nautobot-default-scheduledjob-operator": Group.objects.get_or_create(
+            name="nautobot-default-scheduledjob-operator"
+        )[0],
+        "nautobot-default-scheduledjob-architect": Group.objects.get_or_create(
+            name="nautobot-default-scheduledjob-architect"
+        )[0],
+    }
+
+    # --- Content Types ---
+    ct_workflow = ContentType.objects.get_for_model(ApprovalWorkflow)
+    ct_stage = ContentType.objects.get_for_model(ApprovalWorkflowStage)
+    ct_response = ContentType.objects.get_for_model(ApprovalWorkflowStageResponse)
+    ct_workflow_def = ContentType.objects.get_for_model(ApprovalWorkflowDefinition)
+    ct_stage_def = ContentType.objects.get_for_model(ApprovalWorkflowStageDefinition)
+    ct_scheduled_job = ContentType.objects.get_for_model(ScheduledJob)
+    # --- Approval Workflow Definition ---
+    awf_def, _ = ApprovalWorkflowDefinition.objects.update_or_create(
+        name="Scheduled Jobs Approval - Example",
+        defaults={
+            "model_content_type_id": ct_scheduled_job.id,
+            "model_constraints": {"job_model__job_class_name": "JobThatDoesNotExist"},
+            "weight": 100,
+        },
+    )
+
+    # --- Stage Definition ---
+    ApprovalWorkflowStageDefinition.objects.update_or_create(
+        name="Approval by nautobot-default-scheduledjob-approver",
+        defaults={
+            "approval_workflow_definition": awf_def,
+            "sequence": 10,
+            "min_approvers": 1,
+            "denial_message": "This Job requires an approval from nautobot-default-scheduledjob-approver.",
+            "approver_group": groups["nautobot-default-scheduledjob-approver"],
+        },
+    )
+
+    # --- Object Permissions ---
+    perms_data = [
+        {
+            "name": "nautobot-default-scheduledjobs-architect-permissions",
+            "description": "Nautobot added permission aligned to the Workflow Architect persona.",
+            "enabled": True,
+            "actions": ["view", "add", "change", "delete"],
+            "object_types": [ct_workflow_def.id, ct_stage_def.id],
+            "groups": [groups["nautobot-default-scheduledjob-architect"]],
+        },
+        {
+            "name": "nautobot-default-scheduledjobs-approver-permissions",
+            "description": "Nautobot added permission aligned to the Workflow Approver persona.",
+            "enabled": True,
+            "actions": ["view", "change"],
+            "object_types": [ct_stage.id],
+            "groups": [groups["nautobot-default-scheduledjob-approver"]],
+        },
+        {
+            "name": "nautobot-default-scheduledjobs-operator-permissions",
+            "description": "Nautobot added permission aligned to the Workflow Operator persona.",
+            "enabled": True,
+            "actions": ["view"],
+            "object_types": [ct_workflow.id, ct_stage.id, ct_response.id],
+            "groups": [
+                groups["nautobot-default-scheduledjob-operator"],
+                groups["nautobot-default-scheduledjob-approver"],
+                groups["nautobot-default-scheduledjob-architect"],
+            ],
+        },
+    ]
+
+    for perm in perms_data:
+        obj, _ = ObjectPermission.objects.update_or_create(
+            name=perm["name"],
+            defaults={
+                "description": perm["description"],
+                "enabled": perm["enabled"],
+                "actions": perm["actions"],
+            },
+        )
+        obj.object_types.set(perm["object_types"])
+        obj.groups.set(perm["groups"])
+        obj.save()
+
+
+def reverse_default_scheduledjob_workflow(apps, schema_editor):
+    ObjectPermission = apps.get_model("users", "ObjectPermission")
+    ApprovalWorkflowDefinition = apps.get_model("extras", "ApprovalWorkflowDefinition")
+
+    ObjectPermission.objects.filter(
+        name__in=[
+            "nautobot-default-scheduledjobs-architect-permissions",
+            "nautobot-default-scheduledjobs-approver-permissions",
+            "nautobot-default-scheduledjobs-operator-permissions",
+        ]
+    ).delete()
+
+    ApprovalWorkflowDefinition.objects.filter(name="Scheduled Jobs Approval - Example").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0131_configcontext_device_families"),
+    ]
+
+    operations = [
+        migrations.RunPython(create_default_scheduledjob_workflow, reverse_default_scheduledjob_workflow),
+    ]

nautobot/extras/models/approvals.py

@@ -377,6 +377,16 @@ class ApprovalWorkflowStage(OrganizationalModel):
         # Check if the stage is the active stage and if the stage state is pending
         return self.pk == active_stage.pk and active_stage.state == ApprovalWorkflowStateChoices.PENDING
 
+    @property
+    def is_not_done_stage(self):
+        """
+        Check if the stage is not done (approved or denied).
+
+        Returns:
+            bool: True if the stage is not APPROVED or DENIED
+        """
+        return self.state == ApprovalWorkflowStateChoices.PENDING
+
     @property
     def users_that_already_approved(self):
         """
@@ -518,7 +528,7 @@ class ApprovalWorkflowStageResponse(BaseModel):
         max_length=CHARFIELD_MAX_LENGTH,
         choices=ApprovalWorkflowStateChoices,
         default=ApprovalWorkflowStateChoices.PENDING,
-        help_text="User response to this approval workflow stage instance. Eligible values are: Pending, Approved, Denied.",
+        help_text="User response to this approval workflow stage instance. Eligible values are: Pending, Comment, Approved, Denied.",
     )
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
     is_version_controlled = False

nautobot/extras/models/models.py

@@ -25,6 +25,7 @@ from nautobot.core.models import BaseManager, BaseModel
 from nautobot.core.models.fields import ForeignKeyWithAutoRelatedName, LaxURLField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.utils.data import deepmerge, render_jinja2
+from nautobot.core.utils.lookup import get_filterset_for_model, get_model_for_view_name
 from nautobot.extras.choices import (
     ButtonClassChoices,
     WebhookHttpMethodChoices,
@@ -918,6 +919,24 @@ class SavedView(BaseModel, ChangeLoggedModel):
 
         super().save(*args, **kwargs)
 
+    @property
+    def model(self):
+        """
+        Return the model class associated with this SavedView, based on the 'view' field.
+        """
+        return get_model_for_view_name(self.view)
+
+    def get_filtered_queryset(self, user):
+        """
+        Return a queryset for the associated model, filtered by this SavedView's filter_params.
+        """
+        model = self.model
+        if model is None:
+            return None
+        filter_params = self.config.get("filter_params", {})
+        filterset_class = get_filterset_for_model(model)
+        return filterset_class(filter_params, model.objects.restrict(user)).qs
+
 
 @extras_features("graphql")
 class UserSavedViewAssociation(BaseModel):

nautobot/extras/models/relationships.py

@@ -285,7 +285,9 @@ class RelationshipModel(models.Model):
                             Q(**side_query_params) | Q(**peer_side_query_params)
                         ).distinct()
                         if not relationship.has_many(peer_side):
-                            resp[side][relationship] = resp[side][relationship].first()
+                            resp[RelationshipSideChoices.SIDE_PEER][relationship] = resp[
+                                RelationshipSideChoices.SIDE_PEER
+                            ][relationship].first()
                 else:
                     # Maybe an uninstalled App?
                     # We can't provide a relevant queryset, but we can provide a descriptive string

nautobot/extras/tables.py

@@ -147,8 +147,8 @@ IMAGEATTACHMENT_NAME = """
 IMAGEATTACHMENT_SIZE = """{{ value|filesizeformat }}"""
 
 JOB_BUTTONS = """
-<li><a href="{% url 'extras:job' pk=record.pk %}" class="dropdown-item"><span class="mdi mdi-information-outline" aria-hidden="true"></span>Details</a>
-<li><a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="dropdown-item"><span class="mdi mdi-format-list-bulleted" aria-hidden="true"></span>Job Results</a>
+<li><a href="{% url 'extras:job' pk=record.pk %}" class="dropdown-item"><span class="mdi mdi-information-outline" aria-hidden="true"></span>Details</a></li>
+<li><a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="dropdown-item"><span class="mdi mdi-format-list-bulleted" aria-hidden="true"></span>Job Results</a></li>
 """
 
 JOB_RESULT_BUTTONS = """
@@ -336,19 +336,19 @@ class ApprovalWorkflowTable(BaseTable):
         model = ApprovalWorkflow
         fields = (
             "pk",
-            "approval_workflow_definition",
             "object_under_review_content_type",
             "object_under_review",
-            "current_state",
             "user",
+            "current_state",
+            "approval_workflow_definition",
         )
         default_columns = (
             "pk",
-            "approval_workflow_definition",
             "object_under_review_content_type",
             "object_under_review",
-            "current_state",
             "user",
+            "current_state",
+            "approval_workflow_definition",
             "actions",
         )
 
@@ -385,7 +385,9 @@ class ApprovalWorkflowStageTable(BaseTable):
         verbose_name="Actions Needed",
     )
     state = ApprovalChoiceFieldColumn()
-    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("detail", "changelog", "approve", "deny"))
+    actions = ApprovalButtonsColumn(
+        ApprovalWorkflowStage, buttons=("detail", "changelog", "comment", "approve", "deny")
+    )
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
@@ -424,10 +426,11 @@ class ApproverDashboardTable(ApprovalWorkflowStageTable):
         template_code="<a href={{record.approval_workflow.get_absolute_url}}>{{ record.approval_workflow_stage_definition.name }}</a>",
         verbose_name="Current Stage",
     )
+    approval_workflow__object_under_review_content_type = tables.Column(verbose_name="Object Type Under Review")
     object_under_review = tables.TemplateColumn(
         template_code="<a href={{record.approval_workflow.object_under_review.get_absolute_url }}>{{ record.approval_workflow.object_under_review }}</a>"
     )
-    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "deny"))
+    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "comment", "deny"))
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
@@ -435,6 +438,7 @@ class ApproverDashboardTable(ApprovalWorkflowStageTable):
         model = ApprovalWorkflowStage
         fields = (
             "pk",
+            "approval_workflow__object_under_review_content_type",
             "object_under_review",
             "approval_workflow",
             "approval_workflow_stage",
@@ -444,9 +448,10 @@ class ApproverDashboardTable(ApprovalWorkflowStageTable):
         )
         default_columns = (
             "pk",
-            "approval_workflow_stage",
-            "approval_workflow",
+            "approval_workflow__object_under_review_content_type",
             "object_under_review",
+            "approval_workflow",
+            "approval_workflow_stage",
             "actions_needed",
             "state",
             "actions",
@@ -462,7 +467,7 @@ class RelatedApprovalWorkflowStageTable(ApprovalWorkflowStageTable):
         template_code="<a href={{record.get_absolute_url}}>{{ record.approval_workflow_stage_definition.name }}</a>",
         verbose_name="Stage",
     )
-    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "deny"))
+    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "comment", "deny"))
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
@@ -512,6 +517,9 @@ class ApprovalWorkflowStageResponseTable(BaseTable):
             "state",
         )
 
+    def render_comments(self, value):
+        return render_markdown(value)
+
 
 class RelatedApprovalWorkflowStageResponseTable(ApprovalWorkflowStageResponseTable):
     """Table for ApprovalWorkflowStageResponse list view."""
@@ -766,8 +774,8 @@ class DynamicGroupTable(BaseTable):
 class DynamicGroupMembershipTable(DynamicGroupTable):
     """Hybrid table for displaying info for both group and membership."""
 
-    description = tables.Column(accessor="group.description")
-    members = tables.Column(accessor="group.count", verbose_name="Group Members", orderable=False)
+    description = tables.Column(accessor="group__description")
+    members = tables.Column(accessor="group__count", verbose_name="Group Members", orderable=False)
 
     class Meta(BaseTable.Meta):
         model = DynamicGroupMembership
@@ -1118,7 +1126,7 @@ class JobTable(BaseTable):
 
     def render_name(self, value):
         return format_html(
-            '<span class="btn btn-primary btn-xs"><i class="mdi mdi-play"></i></span>{}',
+            '<span class="btn btn-primary btn-sm p-2 rounded-circle"><span class="mdi mdi-play"></span></span>{}',
             value,
         )
 
@@ -1464,7 +1472,7 @@ class NoteTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Note
-        fields = ("created", "last_updated", "note", "user_name")
+        fields = ("created", "last_updated", "note", "user_name", "actions")
 
     def render_note(self, value):
         return render_markdown(value)
@@ -1653,7 +1661,7 @@ class RoleTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Role
-        fields = ["pk", "name", "color", "weight", "content_types", "description"]
+        fields = ["pk", "name", "color", "weight", "content_types", "description", "actions"]
 
 
 class RoleTableMixin(BaseTable):
@@ -1673,6 +1681,7 @@ class SecretTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
     tags = TagColumn(url_name="extras:secret_list")
+    actions = ButtonsColumn(Secret)
 
     class Meta(BaseTable.Meta):
         model = Secret
@@ -1682,6 +1691,7 @@ class SecretTable(BaseTable):
             "provider",
             "description",
             "tags",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -1689,6 +1699,7 @@ class SecretTable(BaseTable):
             "provider",
             "description",
             "tags",
+            "actions",
         )
 
     def render_provider(self, value):
@@ -1700,6 +1711,7 @@ class SecretsGroupTable(BaseTable):
 
     pk = ToggleColumn()
     name = tables.LinkColumn()
+    actions = ButtonsColumn(SecretsGroup)
 
     class Meta(BaseTable.Meta):
         model = SecretsGroup
@@ -1707,11 +1719,13 @@ class SecretsGroupTable(BaseTable):
             "pk",
             "name",
             "description",
+            "actions",
         )
         default_columns = (
             "pk",
             "name",
             "description",
+            "actions",
         )
 
 
@@ -1818,6 +1832,7 @@ class WebhookTable(BaseTable):
     type_update = BooleanColumn()
     type_delete = BooleanColumn()
     ssl_verification = BooleanColumn()
+    actions = ButtonsColumn(Webhook)
 
     class Meta(BaseTable.Meta):
         model = Webhook
@@ -1834,6 +1849,7 @@ class WebhookTable(BaseTable):
             "type_delete",
             "ssl_verification",
             "ca_file_path",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -1842,6 +1858,7 @@ class WebhookTable(BaseTable):
             "payload_url",
             "http_content_type",
             "enabled",
+            "actions",
         )
 
 
@@ -1853,8 +1870,8 @@ class AssociatedContactsTable(StatusTableMixin, RoleTableMixin, BaseTable):
         attrs={"td": {"style": "width:20px;"}},
     )
     name = tables.TemplateColumn(CONTACT_OR_TEAM, verbose_name="Name")
-    contact_or_team_phone = tables.TemplateColumn(PHONE, accessor="contact_or_team.phone", verbose_name="Phone")
-    contact_or_team_email = tables.TemplateColumn(EMAIL, accessor="contact_or_team.email", verbose_name="E-Mail")
+    contact_or_team_phone = tables.TemplateColumn(PHONE, accessor="contact_or_team__phone", verbose_name="Phone")
+    contact_or_team_email = tables.TemplateColumn(EMAIL, accessor="contact_or_team__email", verbose_name="E-Mail")
     actions = actions = ButtonsColumn(model=ContactAssociation, buttons=("edit", "delete"))
 
     class Meta(BaseTable.Meta):

nautobot/extras/templates/extras/approval_workflow/approve.html

@@ -1,11 +1,18 @@
 {% extends 'utilities/confirmation_form.html' %}
 {% load form_helpers %}
+{% load helpers %}
 
-{% block title %}Approve {{ obj_type }}?{% endblock %}
+
+{% block title %}Approve Workflow Stage?{% endblock %}
 
 {% block message %}
     {% block message_extra %}{% endblock %}
-    <p>Are you sure you want to approve <strong>{{ obj }}</strong> for <strong> {{ object_under_review }}</strong>?</p>
+    <p>Are you sure you want to approve</p>
+    <ul>
+        <li>Stage <strong>{{ obj.approval_workflow_stage_definition.name }}</strong></li>
+        <li>from Workflow <strong>{{ obj.approval_workflow_stage_definition.approval_workflow_definition.name }}</strong></li>
+        <li>for {{ object_under_review|meta:"verbose_name"|bettertitle }} <strong>{{ object_under_review|hyperlinked_object}}</strong>?</li>
+    </ul>
     <p>You can leave optional comments here.</p>
     {% render_field form.comments %}
 {% endblock %}

nautobot/extras/templates/extras/approval_workflow/deny.html

@@ -1,10 +1,16 @@
 {% extends 'utilities/confirmation_form.html' %}
 {% load form_helpers %}
+{% load helpers %}
 
-{% block title %}Deny {{ obj_type }}?{% endblock %}
+{% block title %}Deny Workflow Stage?{% endblock %}
 
 {% block message %}
-    <p>Are you sure you want to deny <strong>{{ obj }}</strong> for <strong> {{ object_under_review }}</strong>?</p>
+    <p>Are you sure you want to deny</p>
+    <ul>
+        <li>Stage <strong>{{ obj.approval_workflow_stage_definition.name }}</strong></li>
+        <li>from Workflow <strong>{{ obj.approval_workflow_stage_definition.approval_workflow_definition.name }}</strong></li>
+        <li>for {{ object_under_review|meta:"verbose_name"|bettertitle }} <strong>{{ object_under_review|hyperlinked_object}}</strong>?</li>
+    </ul>
     <p>You can leave optional comments here.</p>
     {% render_field form.comments %}
-{% endblock %}
+{% endblock %}

nautobot/extras/templates/extras/approvalworkflowdefinition_update.html

@@ -14,7 +14,7 @@
     </div>
     <div class="card">
         <div class="card-header"><strong>Approval Workflow Stage Definitions</strong></div>
-        <div class="card-body">
+        <div class="card-body overflow-auto">
             <table class="table" id="approval-workflow-stages">
                 {{ stages.management_form }}
                 {% for stage in stages.forms %}

nautobot/extras/templates/extras/customfield_update.html

@@ -34,7 +34,7 @@
     </div>
     <div class="card">
         <div class="card-header"><strong>Custom Field Choices</strong></div>
-        <div class="card-body">
+        <div class="card-body overflow-auto">
             {% if choices.errors %}
                 <div class="text-danger">
                     Please correct the error(s) below:

nautobot/extras/templates/extras/dynamicgroup_update.html

@@ -81,7 +81,7 @@
                         </span>
                     {% endif %}
                 </div>
-                <div class="tab-pane" id="children-form">
+                <div class="tab-pane overflow-auto" id="children-form">
                     {% if children.errors %}
                         <div class="text-danger">
                             Please correct the error(s) below:
@@ -192,7 +192,7 @@
         });
 
     // Instead of re-weight on every input change, just do it before we submit the form.
-        $('form.form').submit((e) => {
+        $('#nb-create-form').submit((e) => {
             $(e.target).find('#children-form').each((i, cf) => { update_weights(cf) });
         });
     </script>

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

@@ -8,7 +8,7 @@
         <span class="mdi mdi-history"></span>
     </a>
 {% endif %}
-{% if "approve" in buttons and have_permission and record.is_active_stage %}
+{% if "approve" in buttons and have_permission and record.is_active_stage and can_approve %}
     <span title='{% if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Approve this stage{% endif %}'>
         {% 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 }}"
@@ -22,7 +22,7 @@
         {% 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 %}
+{% if "deny" in buttons and have_permission and record.is_active_stage and request.user not in record.users_that_already_approved and can_approve %}
     <span title='{%if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Deny this stage{% endif %}'>
         {% 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 }}"
@@ -36,3 +36,11 @@
         {% endif %}
     </span>
 {% endif %}
+{% if "comment" in buttons and have_permission and record.is_not_done_stage %}
+    <span title='Comment this stage'>
+        <a href="{% url comment_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}"
+           class="btn btn-secondary btn-sm">
+            <span class="mdi mdi-comment-text-outline"></span>
+        </a>
+    </span>
+{% endif %}

nautobot/extras/templates/extras/inc/job_tiles.html

@@ -21,14 +21,14 @@
 
                 {% if perms.extras.run_job and row.record.runnable %}
                     <a href="{% url 'extras:job_run' pk=row.record.pk %}"
-                       class="btn btn-primary btn-sm"
+                       class="btn btn-primary btn-sm p-2 rounded-circle"
                        data-bs-toggle="tooltip"
                        data-bs-title="Run/Schedule">
                         <span class="mdi mdi-play" aria-hidden="true"><span class="visually-hidden">Run/Schedule</span></span>
                     </a>
                 {% else %}
                     <a aria-disabled="true"
-                       class="btn btn-primary btn-sm disabled"
+                       class="btn btn-primary btn-sm disabled p-2 rounded-circle"
                        data-bs-toggle="tooltip"
                        data-bs-title="Run/Schedule">
                         <span class="mdi mdi-play" aria-hidden="true"><span class="visually-hidden">Run/Schedule</span></span>

nautobot/extras/templates/extras/inc/jobresult.html

@@ -88,7 +88,7 @@
     <div class="card-header">
         <strong>Logs</strong>
         <div class="float-end d-print-none">
-            <input class="form-control" id="log-filter" type="text" placeholder="Filter log level or message" title="Filter log level or message" style="height: 23px" />
+            <input class="form-control" id="log-filter" type="text" placeholder="Filter log level or message" title="Filter log level or message" style="height: 23px; width: 190px;" />
         </div>
     </div>
     {% if result and result.pk %}

nautobot/extras/templates/extras/metadatatype_create.html

@@ -19,7 +19,7 @@
     </div>
     <div class="card">
         <div class="card-header"><strong>Choices (select and multi-select data types)</strong></div>
-        <div class="card-body">
+        <div class="card-body overflow-auto">
             {{ choices.non_field_errors }}
             <table class="table" id="metadata-choices">
                 {{ choices.management_form }}

nautobot/extras/templates/extras/object_approvalworkflow.html

@@ -2,9 +2,6 @@
 {% load approvals %}
 {% load helpers %}
 
-
-{% block title %}{{ block.super }} - Approval Workflow{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-lg-6">
@@ -30,6 +27,8 @@
         </div>
         <div class="col-lg-6">
             {% include 'panel_table.html' with table=stage_table heading="Stages"%}
+        </div>
+        <div class="full-width">
             {% include 'panel_table.html' with table=response_table heading="Responses"%}
         </div>
     </div>

nautobot/extras/templates/extras/secretsgroup_update.html

@@ -12,7 +12,7 @@
     </div>
     <div class="card">
         <div class="card-header"><strong>Secret Assignment</strong></div>
-        <div class="card-body">
+        <div class="card-body overflow-auto">
             {% if secrets.errors %}
                 <div class="text-danger">
                     Please correct the error(s) below: