nautobot 2.4.11__py3-none-any.whl → 2.4.13__py3-none-any.whl

nautobot/extras/models/tags.py

@@ -1,5 +1,6 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.utils.html import format_html
 from taggit.models import GenericUUIDTaggedItemBase
 
 from nautobot.core.choices import ColorChoices
@@ -65,6 +66,9 @@ class Tag(
     class Meta:
         ordering = ["name"]
 
+    def get_color_display(self):
+        return format_html('<span class="label color-block" style="background-color: #{}">&nbsp;</span>', self.color)
+
     def validate_content_types_removal(self, content_types_id):
         """Validate content_types to be removed are not tagged to a model"""
         errors = {}

nautobot/extras/tables.py

@@ -908,7 +908,7 @@ class JobResultTable(BaseTable):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Only calculate log counts for "summary" column if it's actually visible.
-        if self.columns["summary"].visible and isinstance(self.data.data, QuerySet):
+        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(

nautobot/extras/templates/extras/configcontextschema_retrieve.html

@@ -39,10 +39,10 @@
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <strong>Data Schema</strong>
-                    {% include 'extras/inc/json_format.html' %}
+                    {% include 'extras/inc/configcontext_format.html' %}
                 </div>
                 <div class="panel-body">
-                    {% include 'extras/inc/json_data.html' with data=object.data_schema format=format %}
+                    {% include 'extras/inc/json_data.html' with data=object.data_schema format=data_format %}
                 </div>
             </div>
 {% endblock content_right_page %}

nautobot/extras/templates/extras/inc/configcontext_data.html

@@ -1 +1 @@
-{% include 'extras/inc/json_data.html' with data=object.data format=format %}
+{% include 'extras/inc/json_data.html' with data=object.data format=data_format %}

nautobot/extras/templates/extras/inc/configcontext_format.html

@@ -0,0 +1,6 @@
+<div class="pull-right">
+    <div class="btn-group btn-group-xs" role="group">
+        <a href="?data_format=json" class="btn btn-default{% if data_format == 'json' %} active{% endif %}">JSON</a>
+        <a href="?data_format=yaml" class="btn btn-default{% if data_format == 'yaml' %} active{% endif %}">YAML</a>
+    </div>
+</div>

nautobot/extras/templates/extras/inc/json_data.html

@@ -1,5 +1,5 @@
 {% load helpers %}
 
 <div class="rendered-json-data">
-    <pre>{% if data_format == 'json' %}{{ data|render_json }}{% elif data_format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
+    <pre>{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
 </div>

nautobot/extras/templates/extras/inc/json_format.html

@@ -1,6 +1,6 @@
 <div class="pull-right">
     <div class="btn-group btn-group-xs" role="group">
-        <a href="?data_format=json" class="btn btn-default{% if data_format == 'json' %} active{% endif %}">JSON</a>
-        <a href="?data_format=yaml" class="btn btn-default{% if data_format == 'yaml' %} active{% endif %}">YAML</a>
+        <a href="?format=json" class="btn btn-default{% if format == 'json' %} active{% endif %}">JSON</a>
+        <a href="?format=yaml" class="btn btn-default{% if format == 'yaml' %} active{% endif %}">YAML</a>
     </div>
 </div>

nautobot/extras/templates/extras/job_detail.html

@@ -1,327 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-{% load perms %}
-{% load plugins %}
-
-{% block extra_breadcrumbs %}
-    <li>{{ object.grouping }}</li>
-{% endblock extra_breadcrumbs %}
-
-{% block extra_buttons %}
-    {% if perms.extras.run_job %}
-        <a href="{% url 'extras:job_run' pk=object.pk %}" class="btn btn-primary"
-           {% if not object.installed or not object.enabled %}disabled="disabled"{% endif %}>
-            <i class="mdi mdi-play" aria-hidden="true"></i> Run/Schedule
-        </a>
-    {% endif %}
-{% endblock extra_buttons %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Source Code</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Module</td>
-                <td><code>{{ object.module_name }}</code></td>
-            </tr>
-            <tr>
-                <td>Job Class</td>
-                <td><code>{{ object.job_class_name }}</code></td>
-            </tr>
-            <tr>
-                <td>Class Path</td>
-                <td>
-                    <span class="hover_copy">
-                        <span id="job_class_path_copy"><code>{{ object.class_path }}</code></span>
-                        <button class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#job_class_path_copy">
-                            <span class="mdi mdi-content-copy"></span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-            <tr>
-                <td>Installed</td>
-                <td>{{ object.installed | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Is Job Hook Receiver</td>
-                <td>{{ object.is_job_hook_receiver | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Is Job Button Receiver</td>
-                <td>{{ object.is_job_button_receiver | render_boolean }}</td>
-            </tr>
-        </table>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Job</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Grouping</td>
-                <td>{{ object.grouping }}</td>
-                <td>
-                    {% if object.grouping_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                “{{ object.job_class.grouping }}”
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Name</td>
-                <td>{{ object.name }}</td>
-                <td>
-                    {% if object.name_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                “{{ object.job_class.name }}”
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description | render_markdown | placeholder }}</td>
-                <td>
-                    {% if object.description_override %}
-                        <div class="text-muted">
-                            overridden; default is:<br>
-                            {% if object.installed %}
-                                {{ object.job_class.description | render_markdown | placeholder }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Enabled</td>
-                <td>{{ object.enabled | render_boolean }}</td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>Job Results</td>
-                <td>
-                    {% if object.job_results.exists %}
-                        <a href="{% url 'extras:jobresult_list' %}?job_model={{ object.name | urlencode }}">{{ object.job_results.count }}</a>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-                <td></td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Properties</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Approval Required to Execute</td>
-                <td>{{ object.approval_required | render_boolean }}</td>
-                <td>
-                    {% if object.approval_required_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.approval_required | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Supports Dryrun</td>
-                <td colspan="2">{{ object.supports_dryrun | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Default to Dryrun</td>
-                <td>{{ object.dryrun_default | render_boolean }}</td>
-                <td>
-                    {% if object.dryrun_default_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.dryrun_default | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Read-Only Execution</td>
-                <td colspan="2">{{ object.read_only | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Hide from Default UI</td>
-                <td>{{ object.hidden | render_boolean }}</td>
-                <td>
-                    {% if object.hidden_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.hidden | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Has Sensitive Variables</td>
-                <td>{{ object.has_sensitive_variables | render_boolean }}</td>
-                <td>
-                    {% if object.has_sensitive_variables_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.has_sensitive_variables | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Is Singleton</td>
-                <td>{{ object.is_singleton | render_boolean }}</td>
-                <td>
-                    {% if object.is_singleton_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.is_singleton | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Execution Soft Time Limit</td>
-                <td>
-                    {% if object.soft_time_limit > 0 %}
-                        {{ object.soft_time_limit }} seconds
-                    {% else %}
-                        {{ "CELERY_TASK_SOFT_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.soft_time_limit_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {% if object.job_class.soft_time_limit > 0 %}
-                                    {{ object.job_class.soft_time_limit }} seconds
-                                {% else %}
-                                    {{ "CELERY_TASK_SOFT_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Execution Hard Time Limit</td>
-                <td>
-                    {% if object.time_limit > 0 %}
-                        {{ object.time_limit }} seconds
-                    {% else %}
-                        {{ "CELERY_TASK_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.time_limit_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {% if object.job_class.time_limit > 0 %}
-                                    {{ object.job_class.time_limit }} seconds
-                                {% else %}
-                                    {{ "CELERY_TASK_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Job Queues</td>
-                <td>
-                    {% if object.job_queues.exists %}
-                        <ul>
-                            {% for queue in object.job_queues.all %}
-                                <li>{{ queue|hyperlinked_object }}</li>
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.job_queues_override %}
-                        <span class="text-muted">
-                            overridden; default is:<br>
-                            {% if object.installed %}
-                                {% include 'extras/inc/json_data.html' with data=object.job_class.task_queues format="json" %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Default Job Queue</td>
-                <td>
-                    {{ object.default_job_queue|hyperlinked_object }}
-                </td>
-                <td>
-                    {% if object.default_job_queue_override %}
-                        <span class="text-muted">
-                            overridden; default is:
-                            {% if object.installed %}
-                                {% if object.job_class.task_queues|length > 1 %}
-                                    {{ object.job_class.task_queues.0 }}
-                                {% else %}
-                                    {{ None|placeholder }}
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-        </table>
-    </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/extras/templates/extras/tag_retrieve.html

@@ -1,52 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Tag</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Name</td>
-                        <td>
-                            {{ object.name }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Tagged Items</td>
-                        <td>
-                            {{ items_count }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Color</td>
-                        <td>
-                            <span class="label color-block" style="background-color: #{{ object.color }}">&nbsp;</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Content Type(s)</td>
-                        <td>
-                            <ul class="list-unstyled">
-                                {% for ct in content_types %}
-                                    <li>{{ ct }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>
-                            {{ object.description|placeholder }}
-                        </td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            {% include 'panel_table.html' with table=items_table heading='Tagged Objects' %}
-            {% include 'inc/paginator.html' with paginator=items_table.paginator page=items_table.page %}
-            <div class="row"></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/extras/views.py

@@ -26,6 +26,7 @@ from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
 from nautobot.apps.ui import BaseTextPanel
+from nautobot.core.choices import ButtonActionColorChoices
 from nautobot.core.constants import PAGINATE_COUNT_DEFAULT
 from nautobot.core.events import publish_event
 from nautobot.core.exceptions import FilterSetFieldNotFound
@@ -80,7 +81,7 @@ from nautobot.ipam.tables import IPAddressTable, PrefixTable, VLANTable
 from nautobot.virtualization.models import VirtualMachine, VMInterface
 from nautobot.virtualization.tables import VirtualMachineTable, VMInterfaceTable
 
-from . import filters, forms, tables
+from . import filters, forms, jobs_ui, tables
 from .api import serializers
 from .choices import (
     DynamicGroupTypeChoices,
@@ -224,7 +225,7 @@ class ConfigContextUIViewSet(NautobotUIViewSet):
                 weight=100,
                 section=SectionChoices.FULL_WIDTH,
                 label="Data",
-                header_extra_content_template_path="extras/inc/json_format.html",
+                header_extra_content_template_path="extras/inc/configcontext_format.html",
                 body_content_template_path="extras/inc/configcontext_data.html",
             ),
             AssignmentObjectFieldsPanel(
@@ -944,11 +945,13 @@ class DynamicGroupBulkDeleteView(generic.BulkDeleteView):
     filterset = filters.DynamicGroupFilterSet
 
 
-# 3.0 TODO: remove, deprecated since 2.3 (#5845)
 class ObjectDynamicGroupsView(generic.GenericView):
     """
     Present a list of dynamic groups associated to a particular object.
 
+    Note that this isn't currently widely used, as most object detail views currently render the table inline
+    rather than using this separate view. This may change in the future.
+
     base_template: Specify to explicitly identify the base object detail template to render.
         If not provided, "<app>/<model>.html", "<app>/<model>_retrieve.html", or "generic/object_retrieve.html"
         will be used, as per `get_base_template()`.
@@ -968,7 +971,6 @@ class ObjectDynamicGroupsView(generic.GenericView):
             data=obj.dynamic_groups.restrict(request.user, "view"), orderable=False
         )
         dynamicgroups_table.columns.hide("content_type")
-        dynamicgroups_table.columns.hide("members")
 
         # Apply the request context
         paginate = {
@@ -1301,8 +1303,6 @@ class ImageAttachmentDeleteView(generic.ObjectDeleteView):
 #
 # Jobs
 #
-
-
 class JobListView(generic.ObjectListView):
     """
     Retrieve all of the available jobs from disk and the recorded JobResult (if any) for each.
@@ -1554,6 +1554,64 @@ class JobRunView(ObjectPermissionRequiredMixin, View):
 class JobView(generic.ObjectView):
     queryset = JobModel.objects.all()
     template_name = "extras/job_detail.html"
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=[
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                label="Source Code",
+                fields=[
+                    "module_name",
+                    "job_class_name",
+                    "class_path",
+                    "installed",
+                    "is_job_hook_receiver",
+                    "is_job_button_receiver",
+                ],
+            ),
+            jobs_ui.JobObjectFieldsPanel(
+                weight=200,
+                section=SectionChoices.LEFT_HALF,
+                label="Job",
+                fields=["grouping", "name", "description", "enabled"],
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.FULL_WIDTH,
+                table_class=tables.JobResultTable,
+                table_title="JobResults",
+                table_filter=["job_model"],
+            ),
+            jobs_ui.JobObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.RIGHT_HALF,
+                label="Properties",
+                fields=[
+                    "approval_required",
+                    "supports_dryrun",
+                    "dryrun_default",
+                    "read_only",
+                    "hidden",
+                    "has_sensitive_variables",
+                    "is_singleton",
+                    "soft_time_limit",
+                    "time_limit",
+                    "job_queues",
+                    "default_job_queue",
+                ],
+            ),
+        ],
+        extra_buttons=[
+            jobs_ui.JobRunScheduleButton(
+                weight=100,
+                link_name="extras:job_run",
+                label="Run/Schedule",
+                icon="mdi-play",
+                color=ButtonActionColorChoices.SUBMIT,
+                required_permissions=["extras.job_run"],
+            ),
+        ],
+    )
 
 
 class JobEditView(generic.ObjectEditView):
@@ -2986,6 +3044,25 @@ class TagUIViewSet(NautobotUIViewSet):
     serializer_class = serializers.TagSerializer
     table_class = tables.TagTable
 
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields="__all__",
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.RIGHT_HALF,
+                table_class=tables.TaggedItemTable,
+                table_title="Tagged Objects",
+                table_filter="tag",
+                select_related_fields=["content_type"],
+                prefetch_related_fields=["content_object"],
+            ),
+        ),
+    )
+
     def alter_queryset(self, request):
         queryset = super().alter_queryset(request)
 
@@ -2995,29 +3072,6 @@ class TagUIViewSet(NautobotUIViewSet):
 
         return queryset
 
-    def get_extra_context(self, request, instance):
-        # Only run this logic when retrieving a single object
-        if instance is None or self.action != "retrieve":
-            return super().get_extra_context(request, instance)
-        tagged_items = (
-            TaggedItem.objects.filter(tag=instance).select_related("content_type").prefetch_related("content_object")
-        )
-
-        # Generate a table of all items tagged with this Tag
-        items_table = tables.TaggedItemTable(tagged_items)
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(items_table)
-
-        return {
-            "items_count": tagged_items.count(),
-            "items_table": items_table,
-            "content_types": instance.content_types.order_by("app_label", "model"),
-            **super().get_extra_context(request, instance),
-        }
-
 
 #
 # Teams

nautobot/ipam/migrations/0052_alter_ipaddress_index_together_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.20 on 2025-07-17 16:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipam", "0051_added_optional_vrf_relationship_to_vdc"),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name="ipaddress",
+            index_together={("ip_version", "host", "mask_length")},
+        ),
+        migrations.AlterIndexTogether(
+            name="prefix",
+            index_together={
+                ("namespace", "ip_version", "network", "prefix_length"),
+                ("namespace", "network", "broadcast", "prefix_length"),
+                ("network", "broadcast", "prefix_length"),
+            },
+        ),
+        migrations.AlterIndexTogether(
+            name="vrf",
+            index_together={("namespace", "name", "rd")},
+        ),
+    ]