nautobot 2.4.5__py3-none-any.whl → 2.4.7__py3-none-any.whl

nautobot/dcim/views.py

@@ -28,7 +28,6 @@ from rest_framework.exceptions import MethodNotAllowed
 from rest_framework.response import Response
 
 from nautobot.circuits.models import Circuit
-from nautobot.cloud.models import CloudAccount
 from nautobot.cloud.tables import CloudAccountTable
 from nautobot.core.choices import ButtonColorChoices
 from nautobot.core.exceptions import AbortTransaction
@@ -304,7 +303,7 @@ class LocationView(generic.ObjectView):
             .select_related("parent", "location_type")
         )
 
-        children_table = tables.LocationTable(children)
+        children_table = tables.LocationTable(children, hide_hierarchy_ui=True)
 
         paginate = {
             "paginator_class": EnhancedPaginator,
@@ -724,71 +723,40 @@ class RackReservationBulkDeleteView(generic.BulkDeleteView):
 #
 
 
-class ManufacturerListView(generic.ObjectListView):
+class ManufacturerUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.ManufacturerBulkEditForm
+    filterset_class = filters.ManufacturerFilterSet
+    filterset_form_class = forms.ManufacturerFilterForm
+    form_class = forms.ManufacturerForm
+    serializer_class = serializers.ManufacturerSerializer
+    table_class = tables.ManufacturerTable
     queryset = Manufacturer.objects.all()
-    filterset = filters.ManufacturerFilterSet
-    filterset_form = forms.ManufacturerFilterForm
-    table = tables.ManufacturerTable
 
-
-class ManufacturerView(generic.ObjectView):
-    queryset = Manufacturer.objects.all()
-
-    def get_extra_context(self, request, instance):
-        # Devices
-        devices = (
-            Device.objects.restrict(request.user, "view")
-            .filter(device_type__manufacturer=instance)
-            .select_related("status", "location", "tenant", "role", "rack", "device_type")
-        )
-
-        device_table = tables.DeviceTable(devices)
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(device_table)
-
-        # Cloud Accounts
-        cloud_accounts = (
-            CloudAccount.objects.restrict(request.user, "view")
-            .filter(provider=instance)
-            .select_related("secrets_group")
-        )
-
-        cloud_account_table = CloudAccountTable(cloud_accounts)
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(cloud_account_table)
-
-        return {
-            "device_table": device_table,
-            "cloud_account_table": cloud_account_table,
-            **super().get_extra_context(request, instance),
-        }
-
-
-class ManufacturerEditView(generic.ObjectEditView):
-    queryset = Manufacturer.objects.all()
-    model_form = forms.ManufacturerForm
-
-
-class ManufacturerDeleteView(generic.ObjectDeleteView):
-    queryset = Manufacturer.objects.all()
-
-
-class ManufacturerBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = Manufacturer.objects.all()
-    table = tables.ManufacturerTable
-
-
-class ManufacturerBulkDeleteView(generic.BulkDeleteView):
-    queryset = Manufacturer.objects.all()
-    table = tables.ManufacturerTable
-    filterset = filters.ManufacturerFilterSet
+    # Object detail content with devices and cloud accounts related to the manufacturer
+    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.FULL_WIDTH,
+                table_class=tables.DeviceTable,
+                table_filter="device_type__manufacturer",
+                related_field_name="manufacturer",
+                exclude_columns=["manufacturer"],
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.FULL_WIDTH,
+                table_class=CloudAccountTable,
+                table_filter="provider",
+                exclude_columns=["provider"],
+            ),
+        ),
+    )
 
 
 #
@@ -1769,6 +1737,7 @@ class DeviceView(generic.ObjectView):
                 weight=100,
                 color=ButtonColorChoices.BLUE,
                 label="Add Components",
+                attributes={"id": "device-add-components-button"},
                 icon="mdi-plus-thick",
                 required_permissions=["dcim.change_device"],
                 children=(
@@ -3436,7 +3405,7 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
     model_form_class = forms.ModuleBayForm
     serializer_class = serializers.ModuleBaySerializer
     table_class = tables.ModuleBayTable
-    create_template_name = "dcim/modulebay_create.html"
+    create_template_name = "dcim/device_component_add.html"
 
     def get_extra_context(self, request, instance):
         if instance:

nautobot/extras/choices.py

@@ -488,6 +488,8 @@ class SecretsGroupSecretTypeChoices(ChoiceSet):
     TYPE_SECRET = "secret"  # noqa: S105  # hardcoded-password-string -- false positive
     TYPE_TOKEN = "token"  # noqa: S105  # hardcoded-password-string -- false positive
     TYPE_USERNAME = "username"
+    TYPE_URL = "url"
+    TYPE_NOTES = "notes"
 
     CHOICES = (
         (TYPE_KEY, "Key"),
@@ -495,6 +497,8 @@ class SecretsGroupSecretTypeChoices(ChoiceSet):
         (TYPE_SECRET, "Secret"),
         (TYPE_TOKEN, "Token"),
         (TYPE_USERNAME, "Username"),
+        (TYPE_URL, "URL"),
+        (TYPE_NOTES, "Notes"),
     )
 
 

nautobot/extras/filters/__init__.py

@@ -526,6 +526,12 @@ class ContactTeamFilterSet(NameSearchFilterSet, NautobotFilterSet):
 
 
 class ContactFilterSet(ContactTeamFilterSet):
+    teams = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Team.objects.all(),
+        to_field_name="name",
+        label="Team (name or ID)",
+    )
+
     class Meta:
         model = Contact
         fields = "__all__"

nautobot/extras/forms/forms.py

@@ -142,6 +142,7 @@ __all__ = (
     "DynamicGroupFilterForm",
     "DynamicGroupForm",
     "DynamicGroupMembershipFormSet",
+    "ExportTemplateBulkEditForm",
     "ExportTemplateFilterForm",
     "ExportTemplateForm",
     "ExternalIntegrationBulkEditForm",
@@ -180,6 +181,7 @@ __all__ = (
     "ObjectMetadataFilterForm",
     "PasswordInputWithPlaceholder",
     "RelationshipAssociationFilterForm",
+    "RelationshipBulkEditForm",
     "RelationshipFilterForm",
     "RelationshipForm",
     "RoleBulkEditForm",
@@ -519,10 +521,11 @@ class CustomFieldBulkDeleteForm(ConfirmationForm):
         else:
             context = change_context.as_dict(queryset)
             context["context_detail"] = "bulk delete custom field data"
-        tasks = [
-            delete_custom_field_data.si(obj.key, set(obj.content_types.values_list("pk", flat=True)), context)
-            for obj in queryset
-        ]
+        tasks = []
+        for obj in queryset:
+            pk_set = set(obj.content_types.values_list("pk", flat=True))
+            if pk_set:
+                tasks.append(delete_custom_field_data.si(obj.key, pk_set, context))
         return tasks
 
     def perform_pre_delete(self, queryset):
@@ -533,10 +536,11 @@ class CustomFieldBulkDeleteForm(ConfirmationForm):
             logger.error("Celery worker process not running. Object custom fields may fail to reflect this deletion.")
             return
         tasks = self.construct_custom_field_delete_tasks(queryset)
-        # Executing the tasks in the background sequentially using chain() aligns with how a single
-        # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
-        # to be active and comes with extra performance penalty.
-        chain(*tasks).apply_async()
+        if tasks:
+            # Executing the tasks in the background sequentially using chain() aligns with how a single
+            # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
+            # to be active and comes with extra performance penalty.
+            chain(*tasks).apply_async()
 
 
 #
@@ -749,6 +753,31 @@ class StaticGroupAssociationFilterForm(NautobotFilterForm):
 #
 # Export Templates
 #
+class ExportTemplateBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=ExportTemplate.objects.all(), widget=forms.MultipleHiddenInput())
+
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    mime_type = forms.CharField(
+        max_length=CHARFIELD_MAX_LENGTH,
+        required=False,
+        label="MIME type",
+        help_text="Defaults to <code>text/plain</code>",
+    )
+    file_extension = forms.CharField(
+        max_length=CHARFIELD_MAX_LENGTH, required=False, help_text="Extension to append to the rendered filename"
+    )
+
+    content_type = forms.ModelChoiceField(
+        queryset=ContentType.objects.filter(FeatureQuery("export_templates").get_query()).order_by(
+            "app_label", "model"
+        ),
+        required=False,
+        label="Content Type",
+    )
+
+    class Meta:
+        model = ExportTemplate
+        nullable_fields = ["description", "mime_type", "file_extension"]
 
 
 class ExportTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1774,6 +1803,45 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
 #
 
 
+class RelationshipBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditFormMixin, NoteModelBulkEditFormMixin):
+    pk = forms.ModelMultipleChoiceField(queryset=Relationship.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    type = forms.ChoiceField(
+        required=False,
+        label="type",
+        choices=add_blank_choice(RelationshipTypeChoices),
+    )
+    source_hidden = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+    destination_hidden = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+    source_filter = forms.JSONField(required=False, widget=forms.Textarea, help_text="Filter for the source")
+    destination_filter = forms.JSONField(required=False, widget=forms.Textarea, help_text="Filter for the destination")
+    source_type = CSVContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("relationships").get_query()), required=False
+    )
+    destination_type = CSVContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("relationships").get_query()), required=False
+    )
+    source_label = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    destination_label = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    advanced_ui = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+
+    class Meta:
+        model = Relationship
+        fields = [
+            "description",
+            "type",
+            "source_hidden",
+            "destination_hidden",
+            "source_filter",
+            "destination_filter",
+            "source_type",
+            "destination_type",
+            "source_label",
+            "destination_label",
+            "advanced_ui",
+        ]
+
+
 class RelationshipForm(BootstrapMixin, forms.ModelForm):
     key = SlugField(
         help_text="Internal name of this relationship. Please use underscores rather than dashes.",
@@ -1891,8 +1959,11 @@ class RoleBulkEditForm(NautobotBulkEditForm):
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
     description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
     weight = forms.IntegerField(required=False)
-    content_types = MultipleContentTypeField(
-        queryset=RoleModelsQuery().as_queryset(), required=False, label="Content Type(s)"
+    add_content_types = MultipleContentTypeField(
+        queryset=RoleModelsQuery().as_queryset(), required=False, label="Add Content Type(s)"
+    )
+    remove_content_types = MultipleContentTypeField(
+        queryset=RoleModelsQuery().as_queryset(), required=False, label="Remove Content Type(s)"
     )
 
     class Meta:
@@ -2012,7 +2083,8 @@ class StatusBulkEditForm(NautobotBulkEditForm):
 
     pk = forms.ModelMultipleChoiceField(queryset=Status.objects.all(), widget=forms.MultipleHiddenInput)
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
-    content_types = MultipleContentTypeField(feature="statuses", required=False, label="Content Type(s)")
+    add_content_types = MultipleContentTypeField(feature="statuses", required=False, label="Add Content Type(s)")
+    remove_content_types = MultipleContentTypeField(feature="statuses", required=False, label="Remove Content Type(s)")
 
     class Meta:
         nullable_fields = []

nautobot/extras/models/customfields.py

@@ -822,16 +822,17 @@ class CustomField(
 
         super().delete(*args, **kwargs)
 
-        # Circular Import
-        from nautobot.extras.signals import change_context_state
+        if content_types:
+            # Circular Import
+            from nautobot.extras.signals import change_context_state
 
-        change_context = change_context_state.get()
-        if change_context is None:
-            context = None
-        else:
-            context = change_context.as_dict(instance=self)
-            context["context_detail"] = "delete custom field data"
-        delete_custom_field_data.delay(self.key, content_types, context)
+            change_context = change_context_state.get()
+            if change_context is None:
+                context = None
+            else:
+                context = change_context.as_dict(instance=self)
+                context["context_detail"] = "delete custom field data"
+            delete_custom_field_data.delay(self.key, content_types, context)
 
     def add_prefix_to_cf_key(self):
         return "cf_" + str(self.key)

nautobot/extras/plugins/marketplace_manifest.yml

@@ -94,6 +94,24 @@
   "availability": "Open Source"
   "icon": >-
     data:image/png;base64,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
+- "name": "DNS Models"
+  "use_cases":
+  - "DNS"
+  "requires": []
+  "docs": "https://docs.nautobot.com/projects/dns-models/en/latest/"
+  "headline": "Model DNS Zones and their associated records in a vendor-neutral manner."
+  "description": >-
+    DNS Models allows users to document and understand the network by modeling their DNS data. DNS Records can then
+    be directly related to data about the network.
+  "package_name": "nautobot_dns_models"
+  "author": "Network to Code (NTC)"
+  "display":
+    "cloud": true
+    "oss": true
+    "enterprise": true
+  "availability": "Open Source"
+  "icon": >-
+    data:image/png;base64,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
 - "name": "Data Validation Engine"
   "use_cases":
   - "Data Management"

nautobot/extras/signals.py

@@ -125,6 +125,17 @@ def invalidate_relationship_models_cache(sender, **kwargs):
             cache.delete_pattern(f"{method.cache_key_prefix}.*")
 
 
+@receiver(post_save, sender=CustomField)
+@receiver(post_delete, sender=CustomField)
+@receiver(post_save, sender=Relationship)
+@receiver(m2m_changed, sender=Relationship)
+@receiver(post_delete, sender=Relationship)
+def invalidate_openapi_schema_cache(sender, **kwargs):
+    """Invalidate the openapi schema cache."""
+    with contextlib.suppress(redis.exceptions.ConnectionError):
+        cache.delete_pattern("openapi_schema_cache_*")
+
+
 @receiver(post_save)
 @receiver(m2m_changed)
 def _handle_changed_object(sender, instance, raw=False, **kwargs):
@@ -327,7 +338,9 @@ def post_migrate_clear_content_type_caches(sender, app_config, signal, **kwargs)
 
 def handle_cf_removed_obj_types(instance, action, pk_set, **kwargs):
     """
-    Handle the cleanup of old custom field data when a CustomField is removed from one or more ContentTypes.
+    Handle provisioning/deprovisioning of custom_field_data when there are changes to CustomField.content_types.
+
+    The name of this function is misleading as this signal applies to *added* content-types as well.
     """
 
     change_context = change_context_state.get()
@@ -335,13 +348,39 @@ def handle_cf_removed_obj_types(instance, action, pk_set, **kwargs):
         context = None
     else:
         context = change_context.as_dict(instance=instance)
-    if action == "post_remove":
-        # Existing content types have been removed from the custom field, delete their data
+
+    if action == "pre_remove":
+        # Existing content types may be removed from the custom field, delete their data if so.
+        # CAUTION: pk_set in this _remove case is the content-types that were *requested* to remove,
+        # **not** the content-types that actually *will need to be* removed. In other words, this is not idempotent:
+        # my_cf.content_types.remove(device_ct) --> pk_set = {device_ct.pk}
+        # my_cf.content_types.remove(device_ct) --> pk_set = {device_ct.pk} again even though it was already gone
+        # So we need to check which content types will actually be removed to not create unnecessary tasks:
+        removed_pk_set = pk_set.intersection(instance.content_types.values_list("pk", flat=True))
+        if not removed_pk_set:
+            return
+
+        if context:
+            context["context_detail"] = "delete custom field data from existing content types"
+        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, removed_pk_set, context))
+
+    elif action == "pre_clear":
+        # In this case, the provided pk_set is always empty, so we need to look at the current values instead:
+        cleared_pk_set = set(instance.content_types.values_list("pk", flat=True))
+        if not cleared_pk_set:
+            return
+
         if context:
             context["context_detail"] = "delete custom field data from existing content types"
-        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, pk_set, context))
+        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, cleared_pk_set, context))
 
     elif action == "post_add":
+        # Unlike the above _remove case, in the _add case pk_set is the *new* content-types only,
+        # and for whatever reason, Django triggers this signal even if there was no actual change.
+        # To avoid creating unnecessary background tasks, we need to check for this case ourselves:
+        if not pk_set:
+            return
+
         # New content types have been added to the custom field, provision them
         if context:
             context["context_detail"] = "provision custom field data for new content types"

nautobot/extras/tables.py

@@ -1063,14 +1063,13 @@ class ObjectMetadataTable(BaseTable):
 
 class NoteTable(BaseTable):
     actions = ButtonsColumn(Note)
-    created = tables.LinkColumn()
-    note = tables.Column(
-        attrs={"td": {"class": "rendered-markdown"}},
-    )
+    created = tables.DateTimeColumn(linkify=True)
+    last_updated = tables.DateTimeColumn()
+    note = tables.Column()
 
     class Meta(BaseTable.Meta):
         model = Note
-        fields = ("created", "note", "user_name")
+        fields = ("created", "last_updated", "note", "user_name")
 
     def render_note(self, value):
         return render_markdown(value)

nautobot/extras/tasks.py

@@ -121,12 +121,13 @@ def delete_custom_field_data(field_key, content_type_pk_set, change_context=None
     for ct in ContentType.objects.filter(pk__in=content_type_pk_set):
         model = ct.model_class()
         queryset = model.objects.filter(**{f"_custom_field_data__{field_key}__isnull": False})
+        pk_list = []
         if change_context is not None:
             pk_list = list(queryset.values_list("pk", flat=True))
         task_logger.info("Deleting existing values for custom field `%s` from %s records...", field_key, ct.model)
         count = queryset.update(_custom_field_data=JSONRemove("_custom_field_data", field_key))
         task_logger.info("Updated %d records", count)
-        if change_context is not None:
+        if count and change_context is not None:
             # Since we used update() above, we bypassed ObjectChange automatic creation via signals. Create them now
             _generate_bulk_object_changes(change_context, model.objects.filter(pk__in=pk_list), task_logger)
 
@@ -155,6 +156,7 @@ def provision_field(field_id, content_type_pk_set, change_context=None):
     for ct in ContentType.objects.filter(pk__in=content_type_pk_set):
         model = ct.model_class()
         queryset = model.objects.filter(**{f"_custom_field_data__{field.key}__isnull": True})
+        pk_list = []
         if change_context is not None:
             pk_list = list(queryset.values_list("pk", flat=True))
         task_logger.info(
@@ -165,7 +167,7 @@ def provision_field(field_id, content_type_pk_set, change_context=None):
         )
         count = queryset.update(_custom_field_data=JSONSet("_custom_field_data", field.key, field.default))
         task_logger.info("Updated %d records.", count)
-        if change_context is not None:
+        if count and change_context is not None:
             # Since we used update() above, we bypassed ObjectChange automatic creation via signals. Create them now
             _generate_bulk_object_changes(change_context, model.objects.filter(pk__in=pk_list), task_logger)
 

nautobot/extras/templates/extras/contact_retrieve.html

@@ -1,59 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <strong>Contact</strong>
-    </div>
-    <table class="table table-hover panel-body attr-table">
-        <tr>
-            <td>Name</td>
-            <td>{{ object.name }}</td>
-        </tr>
-        <tr>
-            <td>Phone</td>
-            <td>{{ object.phone|hyperlinked_phone_number }}</td>
-        </tr>
-        <tr>
-            <td>E-mail</td>
-            <td>{{ object.email|hyperlinked_email }}</td>
-        </tr>
-        <tr>
-            <td>Address</td>
-            <td>
-                {% if object.address %}
-                    <div class="pull-right noprint">
-                        <a href="https://maps.google.com/?q={{ object.address|urlencode }}" target="_blank" class="btn btn-primary btn-xs">
-                            <i class="mdi mdi-map-marker"></i> Map it
-                        </a>
-                    </div>
-                    <span>{{ object.address|linebreaksbr }}</span>
-                {% else %}
-                    <span class="text-muted">&mdash;</span>
-                {% endif %}
-            </td>
-        </tr>
-    </table>
-</div>
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <strong>Comments</strong>
-    </div>
-    <div class="panel-body rendered-markdown">
-        {% if object.comments %}
-            {{ object.comments|render_markdown }}
-        {% else %}
-            <span class="text-muted">None</span>
-        {% endif %}
-    </div>
-</div>
-{% endblock %}
-
-{% block content_right_page %}
-    {% include 'panel_table.html' with table=teams_table heading='Assigned Teams' %}
-{% endblock %}
-
-{% block content_full_width_page %}
-    {% include 'panel_table.html' with table=contact_associations_table heading='Contact For' %}
-{% endblock %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/exporttemplate.html

@@ -1,54 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Details</strong>
-            </div>
-
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td><span>{{ object.name }}</span></td>
-                </tr>
-                <tr>
-                    <td>Owner</td>
-                    <td>{{ object.owner|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Template</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Object Type</td>
-                    <td><span>{{ object.content_type }}</span></td>
-                </tr>
-                <tr>
-                    <td>Mime Type</td>
-                    <td><span>{{ object.mime_type }}</span></td>
-                </tr>
-                <tr>
-                    <td>File Extension</td>
-                    <td><span>{{ object.file_extension }}</span></td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Code Template</strong>
-                </div>
-                    {% if object.template_code %} <pre>{{ object.template_code }}</pre> {% else %} {{ None }} {% endif %}
-            </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/inc/panel_changelog.html

@@ -21,7 +21,7 @@
                 <br />
                 <small>
                     <span class="text-muted">{{ change.user_name }} -</span>
-                    <a href="{{ change.get_absolute_url }}" class="text-muted">{{ change.time|date:'SHORT_DATETIME_FORMAT' }}</a>
+                    <a href="{{ change.get_absolute_url }}" class="text-muted">{{ change.time|date:settings.SHORT_DATETIME_FORMAT }}</a>
                 </small>
             </div>
         {% endwith %}

nautobot/extras/templates/extras/inc/panel_jobhistory.html

@@ -7,7 +7,7 @@
             <span class="pull-right" title="{{ result.date_created }}">{% include 'extras/inc/job_label.html' %}</span>
             <br>
             <small>
-                <span class="text-muted">{{ result.user }} - {{ result.date_done|date:'SHORT_DATETIME_FORMAT' }}</span>
+                <span class="text-muted">{{ result.user }} - {{ result.date_done|date:settings.SHORT_DATETIME_FORMAT }}</span>
             </small>
         </div>
         {% if forloop.last %}