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

nautobot/extras/filters/mixins.py

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

nautobot/extras/forms/forms.py

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

nautobot/extras/models/groups.py

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

nautobot/extras/models/jobs.py

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

nautobot/extras/plugins/views.py

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

nautobot/extras/tables.py

@@ -38,6 +38,7 @@ from .models import (
     ExternalIntegration,
     GitRepository,
     GraphQLQuery,
+    ImageAttachment,
     Job as JobModel,
     JobButton,
     JobHook,
@@ -113,6 +114,13 @@ GITREPOSITORY_BUTTONS = """
 <button data-url="{% url 'extras:gitrepository_sync' pk=record.pk %}" type="submit" class="btn btn-primary btn-xs sync-repository" title="Sync" {% if not perms.extras.change_gitrepository %}disabled="disabled"{% endif %}><i class="mdi mdi-source-branch-sync" aria-hidden="true"></i></button>
 """
 
+IMAGEATTACHMENT_NAME = """
+<span class="mdi mdi-file-image"></span>
+<a class="image-preview" href="{{ record.image.url }}" target="_blank">{{ record }}</a>
+"""
+
+IMAGEATTACHMENT_SIZE = """{{ value|filesizeformat }}"""
+
 JOB_BUTTONS = """
 <a href="{% url 'extras:job' pk=record.pk %}" class="btn btn-default btn-xs" title="Details"><i class="mdi mdi-information-outline" aria-hidden="true"></i></a>
 <a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
@@ -697,6 +705,18 @@ class GraphQLQueryTable(BaseTable):
         )
 
 
+class ImageAttachmentTable(BaseTable):
+    pk = ToggleColumn()
+    name = tables.TemplateColumn(template_code=IMAGEATTACHMENT_NAME, verbose_name="Name")
+    size = tables.TemplateColumn(template_code=IMAGEATTACHMENT_SIZE)
+    created = tables.DateTimeColumn()
+    actions = ButtonsColumn(ImageAttachment, buttons=("edit", "delete"))
+
+    class Meta(BaseTable.Meta):
+        model = ImageAttachment
+        fields = ("pk", "name", "size", "created", "actions")
+
+
 def log_object_link(value, record):
     return record.absolute_url or None
 
@@ -736,11 +756,12 @@ class JobTable(BaseTable):
         accessor="latest_result",
         template_code="""
             {% if value %}
-                {{ value.date_created|date:settings.SHORT_DATETIME_FORMAT }} by {{ value.user }}
+                {{ value.date_created|date:SHORT_DATETIME_FORMAT }} by {{ value.user }}
             {% else %}
                 <span class="text-muted">Never</span>
             {% endif %}
         """,
+        extra_context={"SHORT_DATETIME_FORMAT": settings.SHORT_DATETIME_FORMAT},
         linkify=lambda value: value.get_absolute_url() if value else None,
     )
     last_status = tables.TemplateColumn(
@@ -906,6 +927,7 @@ class JobResultTable(BaseTable):
         linkify=True,
         verbose_name="Scheduled Job",
     )
+    duration = tables.Column(orderable=False)
     actions = ButtonsColumn(JobResult, buttons=("delete",), prepend_template=JOB_RESULT_BUTTONS)
 
     def __init__(self, *args, **kwargs):
@@ -1069,7 +1091,7 @@ class ObjectMetadataTable(BaseTable):
     )
     # This is needed so that render_value method below does not skip itself
     # when metadata_type.data_type is TYPE_CONTACT_TEAM and we need it to display either contact or team
-    value = tables.Column(empty_values=[])
+    value = tables.Column(empty_values=[], order_by=("_value",))
 
     class Meta(BaseTable.Meta):
         model = ObjectMetadata

nautobot/extras/templates/extras/computedfield_edit.html

@@ -1,8 +1,8 @@
 {% extends 'generic/object_create.html' %}
 
 {% block javascript %}
-{{ block.super }}
-<script type="text/javascript">
-    const slugify_prefer_underscores = true; // Computed fields work better in GraphQL (etc.) with underscore-based slugs
-</script>
+    {{ block.super }}
+    <script type="text/javascript">
+        const slugify_prefer_underscores = true; // Computed fields work better in GraphQL (etc.) with underscore-based slugs
+    </script>
 {% endblock javascript %}

nautobot/extras/templates/extras/configcontext_update.html

@@ -26,7 +26,7 @@
             {% render_field form.device_redundancy_groups %}
             {% render_field form.tags %}
             {% if settings.CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED %}
-            {% render_field form.dynamic_groups %}
+                {% render_field form.dynamic_groups %}
             {% endif %}
         </div>
     </div>

nautobot/extras/templates/extras/configcontextschema_retrieve.html

@@ -10,39 +10,39 @@
 {% endblock extra_nav_tabs %}
 
 {% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Config Context Schema</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Name</td>
-                        <td>
-                            {{ object.name }}
-                        </td>
-                    </tr>
-                    {% if object.owner %}
-                        <tr>
-                            <td>Owner</td>
-                            <td>{{ object.owner|hyperlinked_object }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td>Description</td>
-                        <td>{{ object.description|placeholder }}</td>
-                    </tr>
-                </table>
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Config Context Schema</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Name</td>
+                <td>
+                    {{ object.name }}
+                </td>
+            </tr>
+            {% if object.owner %}
+                <tr>
+                    <td>Owner</td>
+                    <td>{{ object.owner|hyperlinked_object }}</td>
+                </tr>
+            {% endif %}
+            <tr>
+                <td>Description</td>
+                <td>{{ object.description|placeholder }}</td>
+            </tr>
+        </table>
+    </div>
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Data Schema</strong>
-                    {% include 'extras/inc/configcontext_format.html' %}
-                </div>
-                <div class="panel-body">
-                    {% include 'extras/inc/json_data.html' with data=object.data_schema format=data_format %}
-                </div>
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Data Schema</strong>
+            {% include 'extras/inc/configcontext_format.html' %}
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=object.data_schema format=data_format %}
+        </div>
+    </div>
 {% endblock content_right_page %}

nautobot/extras/templates/extras/customfield_retrieve.html

@@ -1,129 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load buttons %}
-{% load helpers %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Custom Field</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Label</td>
-                        <td>{{ object.label }}</td>
-                    </tr>
-                    <tr>
-                        <td>Key</td>
-                        <td>{{ object.key }}</td>
-                    </tr>
-                    <tr>
-                        <td>Type</td>
-                        <td>{{ object.type | capfirst }}</td>
-                    </tr>
-                    <tr>
-                        <td>Weight</td>
-                        <td>{{ object.weight }}</td>
-                    </tr>
-                    <tr>
-                        <td>Grouping</td>
-                        <td>{{ object.grouping | placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>{{ object.description | render_markdown | placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Required</td>
-                        <td>{{ object.required | render_boolean }}</td>
-                    </tr>
-                    <tr>
-                        <td>Default</td>
-                        <td>
-                            {% if object.type == "markdown" %}
-                                {{ object.default | render_markdown | placeholder }}
-                            {% elif object.type == "json" and object.default is not None %}
-                                <pre>{{ object.default | render_json }}</pre>
-                            {% else %}
-                                {{ object.default | placeholder }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Filter Logic</td>
-                        <td>{{ object.filter_logic | capfirst }}</td>
-                    </tr>
-                    <tr>
-                        <td>Move to Advanced Tab</td>
-                        <td>{{ object.advanced_ui | render_boolean }}</td>
-                    </tr>
-                </table>
-            </div>
-            {% if object.custom_field_choices.exists %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Custom Field Choices</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <thead>
-                        <tr>
-                            <th>Value</th>
-                            <th>Weight</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    {% for choice in object.custom_field_choices.all %}
-                        <tr>
-                            <td>{{ choice.value }}</td>
-                            <td>{{ choice.weight }}</td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            {% endif %}
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Assignment</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Content Types</td>
-                        <td>
-                            <ul>
-                                {% for ct in object.content_types.all %}
-                                    <li>{{ ct }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Validation Rules</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Minimum Value/Length</td>
-                        <td>{{ object.validation_minimum | placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Maximum Value/Length</td>
-                        <td>{{ object.validation_maximum | placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Validation Regex</td>
-                        <td>
-                            {% if object.validation_regex %}
-                                <code>{{ object.validation_regex | placeholder }}</code>
-                            {% else %}
-                                {{ object.validation_regex | placeholder }}
-                            {% 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/customfield_update.html

@@ -48,15 +48,15 @@
             {% endif %}
             {{ choices.non_field_errors }}
             <table class="table" id="custom-field-choices">
-              {{ choices.management_form }}
-              {% for choice in choices.forms %}
+                {{ choices.management_form }}
+                {% for choice in choices.forms %}
                     {% if forloop.first %}
                         <thead>
-                        <tr>
-                            {% for field in choice.visible_fields %}
-                                <th>{{ field.label|capfirst }}</th>
-                            {% endfor %}
-                        </tr>
+                            <tr>
+                                {% for field in choice.visible_fields %}
+                                    <th>{{ field.label|capfirst }}</th>
+                                {% endfor %}
+                            </tr>
                         </thead>
                     {% endif %}
                     <tr class="formset_row-{{ choices.prefix }}">
@@ -81,7 +81,7 @@
                             </td>
                         {% endfor %}
                     </tr>
-               {% endfor %}
+                {% endfor %}
             </table>
         </div>
     </div>
@@ -90,19 +90,19 @@
 {% endblock form %}
 
 {% block javascript %}
-{{ block.super }}
-<script src="{% static 'jquery/jquery.formset.js' %}"></script>
-<script type="text/javascript">
-    const slugify_prefer_underscores = true; // Custom fields work better in GraphQL (etc.) with underscore-based slugs
-    $('.formset_row-{{ choices.prefix }}').formset({
-        addText: '<span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add another Custom Field Choice',
-        addCssClass: 'btn btn-primary add-row',
-        deleteText: '<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>',
-        deleteCssClass: 'btn btn-danger delete-row',
-        prefix: '{{ choices.prefix }}',
-        formCssClass: 'dynamic-formset-{{ choices.prefix }}',
-        keepFieldValues: 'input[type="number"]',
-        added: jsify_form
-    });
-</script>
+    {{ block.super }}
+    <script src="{% static 'jquery/jquery.formset.js' %}"></script>
+    <script type="text/javascript">
+        const slugify_prefer_underscores = true; // Custom fields work better in GraphQL (etc.) with underscore-based slugs
+        $('.formset_row-{{ choices.prefix }}').formset({
+            addText: '<span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add another Custom Field Choice',
+            addCssClass: 'btn btn-primary add-row',
+            deleteText: '<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>',
+            deleteCssClass: 'btn btn-danger delete-row',
+            prefix: '{{ choices.prefix }}',
+            formCssClass: 'dynamic-formset-{{ choices.prefix }}',
+            keepFieldValues: 'input[type="number"]',
+            added: jsify_form
+        });
+    </script>
 {% endblock javascript %}

nautobot/extras/templates/extras/dynamicgroup.html

@@ -1,99 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_nav_tabs %}
-        <li role="presentation"{% if request.GET.tab == 'members' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#members" onclick="switch_tab(this.href, reload=false)" aria-controls="members" role="tab" data-toggle="tab">
-                Members {% badge object.count %}
-            </a>
-        </li>
-{% endblock extra_nav_tabs %}
-
-{% 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="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>
-                </div>
-            {% endif %}
-            <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' %}
-                </div>
-            </div>
-        </div>
-{% endblock extra_tab_content %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Dynamic Group</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Name</td>
-                <td><span>{{ object.name }}</span></td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td><span>{{ object.description }}</span></td>
-            </tr>
-            <tr>
-                <td>Content Type</td>
-                <td><span>{{ object.content_type }}</span></td>
-            </tr>
-            <tr>
-                <td>Group Type</td>
-                <td><span>{{ object.get_group_type_display }}</span></td>
-            </tr>
-            {% include 'inc/tenant_table_row.html' %}
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% if object.group_type == "dynamic-filter" %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Filter</strong>
-            </div>
-            <div class="panel-body">
-                <pre>{{ object.filter | render_json }}</pre>
-            </div>
-        </div>
-    {% endif %}
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-    {% if object.group_type != "static" %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Filter Query Logic</strong>
-        </div>
-        <div class="panel-body">
-            {% if object.group_type == "dynamic-set" %}
-                <span class="help-block">
-                    This is a raw representation of the underlying filter that is derived
-                    by aggregating the filters from all descendant groups.
-                </span>
-            {% endif %}
-            <pre>{{ raw_query }}</pre>
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Related Groups</strong>
-        </div>
-        <div class="panel-body">
-            {% if object.group_type == "dynamic-set" %}
-                {% include 'utilities/obj_table.html' with table=descendants_table table_template='panel_table.html' heading='Descendants' disable_pagination=True %}
-            {% endif %}
-            {% include 'utilities/obj_table.html' with table=ancestors_table table_template='panel_table.html' heading='Ancestors' disable_pagination=True %}
-        </div>
-    </div>
-    {% endif %}
-{% endblock content_full_width_page %}
+{% extends 'extras/dynamicgroup_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}