nautobot 3.0.4__py3-none-any.whl → 3.0.5__py3-none-any.whl

nautobot/core/tables.py

@@ -9,7 +9,7 @@ from django.db.models import Prefetch, QuerySet
 from django.db.models.fields.related import ForeignKey, RelatedField
 from django.db.models.fields.reverse_related import ManyToOneRel
 from django.urls import reverse
-from django.utils.html import escape, format_html, format_html_join
+from django.utils.html import format_html, format_html_join
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 from django.utils.text import Truncator
@@ -36,6 +36,7 @@ class BaseTable(django_tables2.Table):
         attrs = {
             "class": "table table-hover nb-table-headings",
         }
+        default = helpers.HTML_NONE
 
     def __init__(
         self,
@@ -579,7 +580,13 @@ class ColoredLabelColumn(django_tables2.TemplateColumn):
 
     template_code = """
     {% load helpers %}
-    {% if value %}<span class="badge" style="color: {{ value.color|fgcolor }}; background-color: #{{ value.color }}">{{ value }}</span>{% else %}&mdash;{% endif %}
+    {% if value %}
+        <span class="badge" style="color: {{ value.color|fgcolor }}; background-color: #{{ value.color }}">
+            {{ value }}
+        </span>
+    {% else %}
+        <span class="text-secondary">&mdash;</span>
+    {% endif %}
     """
 
     def __init__(self, *args, **kwargs):
@@ -757,29 +764,33 @@ class CustomFieldColumn(django_tables2.Column):
     Display custom fields in the appropriate format.
     """
 
-    # Add [] to empty_values so when there is no choice populated for multiselect_cf i.e. [], "—" is returned automatically.
-    empty_values = (None, "", [])
-
     def __init__(self, customfield, *args, **kwargs):
         self.customfield = customfield
         kwargs["accessor"] = Accessor(f"_custom_field_data__{customfield.key}")
         kwargs["verbose_name"] = customfield.label
+        if self.customfield.type == choices.CustomFieldTypeChoices.TYPE_MULTISELECT:
+            # Add [] to empty_values so when there is no choice populated i.e. [], "—" is returned automatically.
+            kwargs.setdefault("empty_values", (None, "", []))
 
         super().__init__(*args, **kwargs)
 
     def render(self, *, record, bound_column, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
-        if self.customfield.type == choices.CustomFieldTypeChoices.TYPE_BOOLEAN:
-            template = helpers.render_boolean(value)
-        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_MULTISELECT:
-            template = format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
-        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_SELECT:
-            template = format_html('<span class="badge bg-secondary">{}</span>', value)
-        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_URL:
-            template = format_html('<a href="{}">{}</a>', value, value)
-        else:
-            template = escape(value)
+        # TODO: this logic could be unified with _ObjectCustomFieldsPanel.render_value
+        if self.customfield.type == choices.CustomFieldTypeChoices.TYPE_BOOLEAN and value is not None:
+            value = helpers.render_boolean(value)
+        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_JSON and value is not None:
+            value = helpers.render_json(value, pretty_print=True)
+        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_MARKDOWN and value is not None:
+            value = helpers.render_markdown(value)
+        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_MULTISELECT and value:
+            value = format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
+        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_SELECT and value is not None:
+            value = format_html('<span class="badge bg-secondary">{}</span>', value)
+        elif self.customfield.type == choices.CustomFieldTypeChoices.TYPE_URL and value:
+            value = format_html('<a href="{}">{}</a>', value, value)
+        # else (TEXT, INTEGER, DATE) or None value -- no need to do special rendering
 
-        return template
+        return value
 
 
 class RelationshipColumn(django_tables2.Column):
@@ -811,7 +822,7 @@ class RelationshipColumn(django_tables2.Column):
         # Handle Symmetric Relationships
         # List `value` could be empty here [] after the filtering from above
         if len(value) < 1:
-            return "—"
+            return helpers.HTML_NONE
 
         v = value[0]
         peer = v.get_peer(record)

nautobot/core/templates/graphene/graphiql.html

@@ -81,11 +81,9 @@ add "&raw" to the end of the URL within a browser.
         <!-- As Nautobot may be run without internet access, we source these files locally rather than from an online CDN -->
         <link rel="stylesheet"
               href="{% static 'dist/css/graphql-libraries.css' %}"
-              onerror="window.location='{% url 'media_failure' %}?filename=dist/css/graphql-libraries.css'">
-        <script src="{% static 'dist/js/graphql-libraries.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=dist/js/graphiql-libraries.js'"></script>
-        <script src="{% static 'dist/js/nautobot-graphiql.js' %}"
-                onerror="window.location='{% url 'media_failure' %}?filename=dist/js/nautobot-graphiql.js'"></script>
+              onerror="nb.media.handleFailure(this)">
+        <script src="{% static 'dist/js/graphql-libraries.js' %}" onerror="nb.media.handleFailure(this)"></script>
+        <script src="{% static 'dist/js/nautobot-graphiql.js' %}" onerror="nb.media.handleFailure(this)"></script>
     </head>
     <body>
         <!-- Nautobot page contents -->

nautobot/core/templates/inc/javascript.html

@@ -2,16 +2,11 @@
 {% load plugins %}
 {% load static %}
 
-<script src="{% static 'dist/js/nautobot.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=dist/js/nautobot.js'"></script>
-<script src="{% static 'dist/js/libraries.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=dist/js/libraries.js'"></script>
-<script src="{% versioned_static 'js/forms.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=js/forms.js'"></script>
-<script src="{% versioned_static 'js/table_sorting_indicator.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=js/table_sorting_indicator.js'"></script>
-<script src="{% versioned_static 'js/dropdown.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=js/dropdown.js'"></script>
+<script src="{% static 'dist/js/nautobot.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% static 'dist/js/libraries.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/forms.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/table_sorting_indicator.js' %}" onerror="nb.media.handleFailure(this)"></script>
+<script src="{% versioned_static 'js/dropdown.js' %}" onerror="nb.media.handleFailure(this)"></script>
 <script type="text/javascript">
     var nautobot_static_url = "{% static '' %}";
     var nautobot_api_path = "{% url 'api-root' %}";

nautobot/core/templates/inc/media.html

@@ -1,25 +1,26 @@
 {% load static %}
 {% load helpers %}
 {% load plugins %}
+{% include 'inc/media_failure.html' %}
 <link rel="stylesheet" id="template-theme"
       href="{% url 'template_css' %}">
 <link rel="stylesheet"
       href="{% static 'dist/css/nautobot.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=dist/css/nautobot.css'">
+      onerror="nb.media.handleFailure(this)">
 <link rel="stylesheet"
       href="{% static 'dist/css/materialdesignicons.css' %}"
-      onerror="window.location='{% url 'media_failure' %}?filename=dist/css/materialdesignicons.css'">
+      onerror="nb.media.handleFailure(this)">
 {% with cookie_theme=request.COOKIES|get_item:'theme' %}
     {% if not cookie_theme or cookie_theme == 'light' %}
         <link rel="stylesheet"
               href="{% static 'dist/css/github.min.css' %}"
-              onerror="window.location='{% url 'media_failure' %}?filename=dist/css/github.min.css'"
+              onerror="nb.media.handleFailure(this)"
               {% if not cookie_theme %}media="not (prefers-color-scheme: dark)"{% endif %}>
     {% endif %}
     {% if not cookie_theme or cookie_theme == 'dark' %}
         <link rel="stylesheet"
               href="{% static 'dist/css/github-dark.min.css' %}"
-              onerror="window.location='{% url 'media_failure' %}?filename=dist/css/github-dark.min.css'"
+              onerror="nb.media.handleFailure(this)"
               {% if not cookie_theme %}media="(prefers-color-scheme: dark)"{% endif %}>
     {% endif %}
 {% endwith %}

nautobot/core/templates/inc/media_failure.html

@@ -0,0 +1,73 @@
+{% load static %}
+
+<script>
+    (function initMediaFailure() {
+        // Create React-style `ref` reference to the media failure alert element.
+        const failureAlertRef = { current: null };
+
+        // Store all media failures inside `Map` containing `Set` values to ensure uniqueness of all reported failures.
+        const failures = new Map();
+
+        function handleFailure(element) {
+            const url = element.href || element.src || '';
+
+            if (url) {
+                // Update `failures` with a proper entry corresponding to the current media failure and update media failure alert.
+                const elements = failures.get(url) || new Set();
+                elements.add(element);
+                failures.set(url, elements);
+                updateFailureAlert();
+            }
+        }
+
+        function updateFailureAlert() {
+            const count = Array.from(failures.values()).reduce((count, elements) => count + elements.size, 0);
+
+            const innerHTML = `
+                <div style="margin: auto; max-width: 50rem;">
+                    <h2 style="margin-top: 0; text-align: center;">Static Media Failure</h2>
+                    <p><strong>${count}</strong> static media file${count > 1 ? 's' : ''} failed to load.</p>
+                    <p style="margin-bottom: 0;">
+                        Check whether
+                        <code><strong>nautobot-server collectstatic</strong></code>
+                        was run during the most recent upgrade and that the HTTP service (e.g. NGINX) is configured to serve static files.
+                        Refer to
+                        <a href="https://docs.nautobot.com/projects/core/en/v{{ settings.VERSION }}/installation/http-server/#static-media-failure" target="_blank">
+                            the installation documentation
+                        </a>
+                        for further guidance.
+                    </p>
+                </div>
+            `;
+
+            // If media failure alert already exists, just update its content and return early.
+            if (failureAlertRef.current) {
+                failureAlertRef.current.innerHTML = innerHTML;
+                return;
+            }
+
+            // If media failure alert does not exist yet, create one.
+            const alert = document.createElement('div');
+            alert.classList.add('alert', 'alert-danger', 'media-failure-banner');
+            alert.setAttribute('role', 'alert');
+            alert.innerHTML = innerHTML;
+
+            // Copy and hardcode Bootstrap `"alert alert-danger"` styles here to make the alert core styles independent of other CSS.
+            alert.style.setProperty('background-color', 'var(--bs-alert-bg, var(--bs-danger-bg-subtle, #fce8e8))');
+            alert.style.setProperty('border', 'var(--bs-alert-border, var(--bs-border-width, 0.0625rem) solid var(--bs-alert-border-color, var(--bs-danger-border-subtle, #f9d2d2)))');
+            alert.style.setProperty('border-radius', '0');
+            alert.style.setProperty('color', 'var(--bs-alert-color, var(--bs-danger-text-emphasis, #e01f1f))');
+            alert.style.setProperty('grid-area', 'banner-global-area');
+            alert.style.setProperty('padding', 'var(--bs-alert-padding-y, 1rem) 1.25rem');
+            alert.style.setProperty('position', 'relative');
+
+            // Update React-style `ref` to simplify later alert updates if required and place the alert as the first child of document body.
+            failureAlertRef.current = alert;
+            document.body.prepend(alert);
+        }
+
+        // Export `media` "API" to `window` global object to enable accessing it from other scripts.
+        window.nb = window.nb || {};
+        window.nb.media = { failures, handleFailure }
+    })();
+</script>

nautobot/core/templates/media_failure.html

@@ -1,3 +1,4 @@
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 3.0 and earlier{% endcomment %}
 {% load static %}
 <!DOCTYPE html>
 <html lang="en">

nautobot/core/tests/test_templatetags_helpers.py

@@ -48,23 +48,23 @@ class NautobotTemplatetagsHelperTest(TestCase):
         self.assertEqual(
             helpers.hyperlinked_email("admin@example.com"), '<a href="mailto:admin@example.com">admin@example.com</a>'
         )
-        self.assertEqual(helpers.hyperlinked_email(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_email(None), helpers.HTML_NONE)
 
     def test_hyperlinked_phone_number(self):
         self.assertEqual(helpers.hyperlinked_phone_number("555-1234"), '<a href="tel:555-1234">555-1234</a>')
-        self.assertEqual(helpers.hyperlinked_phone_number(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_phone_number(None), helpers.HTML_NONE)
 
     def test_placeholder(self):
-        self.assertEqual(helpers.placeholder(None), '<span class="text-secondary">&mdash;</span>')
-        self.assertEqual(helpers.placeholder([]), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.placeholder(None), helpers.HTML_NONE)
+        self.assertEqual(helpers.placeholder([]), helpers.HTML_NONE)
         self.assertEqual(helpers.placeholder("something"), "something")
 
     def test_pre_tag(self):
-        self.assertEqual(helpers.pre_tag(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.pre_tag(None), helpers.HTML_NONE)
         self.assertEqual(helpers.pre_tag([]), "<pre>[]</pre>")
         self.assertEqual(helpers.pre_tag("something"), "<pre>something</pre>")
-        self.assertEqual(helpers.pre_tag("", format_empty_value=False), '<span class="text-secondary">&mdash;</span>')
-        self.assertEqual(helpers.pre_tag([], format_empty_value=False), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.pre_tag("", format_empty_value=False), helpers.HTML_NONE)
+        self.assertEqual(helpers.pre_tag([], format_empty_value=False), helpers.HTML_NONE)
         self.assertEqual(helpers.pre_tag("something", format_empty_value=False), "<pre>something</pre>")
 
     def test_add_html_id(self):
@@ -263,7 +263,7 @@ class NautobotTemplatetagsHelperTest(TestCase):
                 helpers.render_boolean(value),
                 '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>',
             )
-        self.assertEqual(helpers.render_boolean(None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.render_boolean(None), helpers.HTML_NONE)
 
     def test_hyperlinked_object_with_color(self):
         vlan_with_role = VLAN.objects.filter(role__isnull=False).first()
@@ -276,7 +276,7 @@ class NautobotTemplatetagsHelperTest(TestCase):
             f'<span class="badge" style="color: {fbcolor}; background-color: #{color}">{display}</span>',
         )
         # Assert when obj is None
-        self.assertEqual(helpers.hyperlinked_object_with_color(obj=None), '<span class="text-secondary">&mdash;</span>')
+        self.assertEqual(helpers.hyperlinked_object_with_color(obj=None), helpers.HTML_NONE)
 
     @tag("example_app")
     @override_settings(BANNER_TOP="¡Hola, mundo!")

nautobot/core/ui/object_detail.py

@@ -1917,6 +1917,7 @@ class _ObjectCustomFieldsPanel(GroupedKeyValueTablePanel):
 
     def render_value(self, key, value, context: Context):
         """Render a given custom field value appropriately depending on what type of custom field it is."""
+        # TODO: this logic could be unified with CustomFieldColumn.render()?
         cf = key
         if cf.type == CustomFieldTypeChoices.TYPE_BOOLEAN:
             return render_boolean(value)

nautobot/dcim/tables/devices.py

@@ -11,7 +11,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
-from nautobot.core.templatetags.helpers import humanize_speed
+from nautobot.core.templatetags.helpers import HTML_NONE, humanize_speed
 from nautobot.dcim.models import (
     ConsolePort,
     ConsoleServerPort,
@@ -263,7 +263,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("—")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 
@@ -1505,7 +1505,7 @@ class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("&mdash;")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 
@@ -1569,7 +1569,7 @@ class ControllerManagedDeviceGroupTable(BaseTable):
     def render_capabilities(self, value):
         """Render capabilities."""
         if not value:
-            return format_html("&mdash;")
+            return HTML_NONE
         return format_html_join(" ", '<span class="badge bg-secondary">{}</span>', ((v,) for v in value))
 
 

nautobot/dcim/tables/template_code.py

@@ -4,7 +4,7 @@ CABLETERMINATION = """
     <i class="mdi mdi-chevron-right"></i>
     <a href="{{ value.get_absolute_url }}">{{ value }}</a>
 {% else %}
-    &mdash;
+    <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 
@@ -26,12 +26,16 @@ PATHENDPOINT = """
         {% endfor %}
     {% endwith %}
 {% else %}
-    &mdash;
+    <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 
 CABLE_LENGTH = """
-{% if record.length %}{{ record.length }} {{ record.get_length_unit_display }}{% else %}&mdash;{% endif %}
+{% if record.length %}
+    {{ record.length }} {{ record.get_length_unit_display }}
+{% else %}
+    <span class="text-secondary">&mdash;</span>
+{% endif %}
 """
 
 CABLE_TERMINATION_PARENT = """
@@ -83,7 +87,7 @@ INTERFACE_TAGGED_VLANS = """
 {% elif record.mode == 'tagged-all' %}
   All
 {% else %}
-  &mdash;
+  <span class="text-secondary">&mdash;</span>
 {% endif %}
 """
 

nautobot/dcim/tests/test_tables.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 
+from nautobot.core.templatetags import helpers
 from nautobot.dcim.choices import InterfaceDuplexChoices, InterfaceSpeedChoices, InterfaceTypeChoices
 from nautobot.dcim.models import Device, DeviceType, Interface, InterfaceTemplate, Location, LocationType, Manufacturer
 from nautobot.dcim.tables.devices import DeviceModuleInterfaceTable, InterfaceTable
@@ -52,7 +53,6 @@ class InterfaceTableRenderMixin:
 
     def test_render_speed_duplex_with_none(self):
         """Test that the table handles None speed value and renders an emdash."""
-        emdash = "\u2014"
         interface = Interface.objects.create(
             device=self.device,
             name="eth1",
@@ -67,8 +67,8 @@ class InterfaceTableRenderMixin:
         rendered_speed = bound_row.get_cell("speed")
         rendered_duplex = bound_row.get_cell("duplex")
 
-        self.assertEqual(rendered_speed, emdash)
-        self.assertEqual(rendered_duplex, emdash)
+        self.assertEqual(rendered_speed, helpers.HTML_NONE)
+        self.assertEqual(rendered_duplex, helpers.HTML_NONE)
 
     def test_render_speed_various(self):
         """Test that the table correctly humanizes various speed values."""
@@ -146,7 +146,6 @@ class InterfaceTemplateTableTestCase(TestCase):
         self.assertEqual(rendered_duplex, "Full")
 
     def test_render_speed_duplex_with_none(self):
-        emdash = "\u2014"
         interface_template = InterfaceTemplate.objects.create(
             device_type=self.device_type,
             name="tmpl-eth1",
@@ -156,5 +155,5 @@ class InterfaceTemplateTableTestCase(TestCase):
         bound_row = table.rows[0]
         rendered_speed = bound_row.get_cell("speed")  # pylint: disable=no-member
         rendered_duplex = bound_row.get_cell("duplex")  # pylint: disable=no-member
-        self.assertEqual(rendered_speed, emdash)
-        self.assertEqual(rendered_duplex, emdash)
+        self.assertEqual(rendered_speed, helpers.HTML_NONE)
+        self.assertEqual(rendered_duplex, helpers.HTML_NONE)

nautobot/dcim/views.py

@@ -35,7 +35,6 @@ from nautobot.core.exceptions import AbortTransaction
 from nautobot.core.forms import BulkRenameForm, ConfirmationForm, ImportForm, restrict_form_fields
 from nautobot.core.models.querysets import count_related
 from nautobot.core.templatetags import helpers
-from nautobot.core.templatetags.helpers import bettertitle, has_perms
 from nautobot.core.ui import object_detail
 from nautobot.core.ui.breadcrumbs import (
     AncestorsInstanceBreadcrumbItem,
@@ -559,14 +558,14 @@ class MigrateLocationDataToContactView(generic.ObjectEditView):
         migrate_action = request.POST.get("action")
         try:
             with transaction.atomic():
-                if not has_perms(request.user, ["extras.add_contactassociation"]):
+                if not helpers.has_perms(request.user, ["extras.add_contactassociation"]):
                     raise PermissionDenied(
                         "ObjectPermission extras.add_contactassociation is needed to perform this action"
                     )
                 contact = None
                 team = None
                 if migrate_action == LocationDataToContactActionChoices.CREATE_AND_ASSIGN_NEW_CONTACT:
-                    if not has_perms(request.user, ["extras.add_contact"]):
+                    if not helpers.has_perms(request.user, ["extras.add_contact"]):
                         raise PermissionDenied("ObjectPermission extras.add_contact is needed to perform this action")
                     contact = Contact(
                         name=request.POST.get("name"),
@@ -577,7 +576,7 @@ class MigrateLocationDataToContactView(generic.ObjectEditView):
                     # Trigger permission check
                     Contact.objects.restrict(request.user, "view").get(pk=contact.pk)
                 elif migrate_action == LocationDataToContactActionChoices.CREATE_AND_ASSIGN_NEW_TEAM:
-                    if not has_perms(request.user, ["extras.add_team"]):
+                    if not helpers.has_perms(request.user, ["extras.add_team"]):
                         raise PermissionDenied("ObjectPermission extras.add_team is needed to perform this action")
                     team = Team(
                         name=request.POST.get("name"),
@@ -958,7 +957,7 @@ class DeviceTypeFieldsPanel(object_detail.ObjectFieldsPanel):
                     image.url,
                     image.name,
                 )
-            return format_html('<span class="text-secondary">&mdash;</span>')
+            return helpers.HTML_NONE
 
         return super().render_value(key, value, context)
 
@@ -2309,7 +2308,7 @@ class DeviceComponentPageMixin:
                     view_name=device_breadcrumb_url,
                     should_render=lambda c: c["object"].device is not None,
                     reverse_kwargs=lambda c: {"pk": c["object"].device.pk},
-                    label=lambda c: bettertitle(c["object"]._meta.verbose_name_plural),
+                    label=lambda c: helpers.bettertitle(c["object"]._meta.verbose_name_plural),
                 ),
             )
 
@@ -2319,7 +2318,7 @@ class DeviceComponentPageMixin:
                     view_name=module_breadcrumb_url,
                     should_render=lambda c: c["object"].device is None,
                     reverse_kwargs=lambda c: {"pk": c["object"].module.pk},
-                    label=lambda c: bettertitle(c["object"]._meta.verbose_name_plural),
+                    label=lambda c: helpers.bettertitle(c["object"]._meta.verbose_name_plural),
                 ),
             )
 

nautobot/extras/tables.py

@@ -374,11 +374,11 @@ class ApprovalWorkflowStageTable(BaseTable):
     actions_needed = tables.TemplateColumn(
         template_code="""
         {% if record.remaining_approvals == 1 %}
-        {{ record.remaining_approvals }} more approval needed
+            {{ record.remaining_approvals }} more approval needed
         {% elif record.remaining_approvals == 0 %}
-        <span class="text-secondary">&mdash;</span>
+            <span class="text-secondary">&mdash;</span>
         {% else %}
-        {{ record.remaining_approvals }} more approvals needed
+            {{ record.remaining_approvals }} more approvals needed
         {% endif %}
         """,
         orderable=False,

nautobot/extras/templates/extras/inc/jobresult_js.html

@@ -10,5 +10,4 @@
     var job_result_id = "{{ result.pk }}";
 
 </script>
-<script src="{% versioned_static 'js/job_result.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=js/job_result.js'"></script>
+<script src="{% versioned_static 'js/job_result.js' %}" onerror="nb.media.handleFailure(this)"></script>

nautobot/extras/templates/extras/scheduledjob.html

@@ -143,7 +143,9 @@
                         <td>{% if value is None %}–{% else %}<code>{{ value }}</code>{% endif %}</td>
                     </tr>
                 {% empty %}
-                    <tr><td>—</td></tr>
+                    <tr>
+                        <td><span class="text-secondary">&mdash;</span></td>
+                    </tr>
                 {% endfor %}
             </table>
         </div>

nautobot/extras/tests/test_customfields.py

@@ -2338,6 +2338,22 @@ class CustomFieldTableTest(TestCase):
         cf_multi_select.default = ["Foo", "Bar"]
         cf_multi_select.validated_save()
 
+        # JSON custom field
+        cf_json = CustomField(
+            type=CustomFieldTypeChoices.TYPE_JSON,
+            label="JSON Field",
+        )
+        cf_json.validated_save()
+        cf_json.content_types.set([content_type])
+
+        # Markdown custom field
+        cf_markdown = CustomField(
+            type=CustomFieldTypeChoices.TYPE_MARKDOWN,
+            label="Markdown Field",
+        )
+        cf_markdown.validated_save()
+        cf_markdown.content_types.set([content_type])
+
         statuses = Status.objects.get_for_model(Location)
 
         # Create a location
@@ -2346,7 +2362,7 @@ class CustomFieldTableTest(TestCase):
             name="Location Custom", status=statuses.first(), location_type=location_type
         )
 
-        # Assign custom field values for location 2
+        # Assign custom field values for location
         self.location._custom_field_data = {
             cf_text.key: "bar",
             cf_integer.key: 456,
@@ -2355,16 +2371,39 @@ class CustomFieldTableTest(TestCase):
             cf_url.key: "http://example.com/2",
             cf_select.key: "Bar",
             cf_multi_select.key: ["Bar", "Baz"],
+            cf_json.key: {"hello": "world"},
+            cf_markdown.key: "## Heading",
         }
         self.location.validated_save()
 
+        # Create a second location
+        self.location_2 = Location.objects.create(
+            name="Location Custom 2", status=statuses.first(), location_type=location_type
+        )
+
+        # Assign custom field values for location 2
+        self.location_2._custom_field_data = {
+            cf_text.key: "<script></script>",
+            cf_integer.key: 0,
+            cf_boolean.key: False,
+            cf_date.key: None,
+            cf_url.key: "",
+            cf_select.key: None,
+            cf_multi_select.key: [],
+            cf_json.key: {},
+            cf_markdown.key: "",
+        }
+        self.location_2.validated_save()
+
+        self.maxDiff = None
+
     def test_custom_field_table_render(self):
-        queryset = Location.objects.filter(name=self.location.name)
+        queryset = Location.objects.filter(name__in=[self.location.name, self.location_2.name])
         location_table = LocationTable(queryset)
 
         custom_column_expected = {
             "text_field": "bar",
-            "number_field": "456",
+            "number_field": 456,
             "boolean_field": '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
             "date_field": "2020-01-02",
             "url_field": '<a href="http://example.com/2">http://example.com/2</a>',
@@ -2372,18 +2411,45 @@ class CustomFieldTableTest(TestCase):
             "multi_choice_field": (
                 '<span class="badge bg-secondary">Bar</span> <span class="badge bg-secondary">Baz</span>'
             ),
+            "json_field": '<pre><code class="language-json">{\n&quot;hello&quot;: &quot;world&quot;\n}</code></pre>',
+            "markdown_field": "<h2>Heading</h2>",
         }
 
         bound_row = location_table.rows[0]
 
         for col_name, col_expected_value in custom_column_expected.items():
-            internal_col_name = "cf_" + col_name
-            custom_column = location_table.base_columns.get(internal_col_name)
-            self.assertIsNotNone(custom_column, internal_col_name)
-            self.assertIsInstance(custom_column, CustomFieldColumn)
+            with self.subTest(col_name=col_name, col_expected_value=col_expected_value):
+                internal_col_name = "cf_" + col_name
+                custom_column = location_table.base_columns.get(internal_col_name)
+                self.assertIsNotNone(custom_column, internal_col_name)
+                self.assertIsInstance(custom_column, CustomFieldColumn)
+
+                rendered_value = bound_row.get_cell(internal_col_name)  # pylint: disable=no-member
+                self.assertHTMLEqual(str(rendered_value), str(col_expected_value))
+
+        custom_column_expected_2 = {
+            "text_field": "<script></script>",
+            "number_field": 0,
+            "boolean_field": '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>',
+            "date_field": '<span class="text-secondary">&mdash;</span>',
+            "url_field": '<span class="text-secondary">&mdash;</span>',
+            "choice_field": '<span class="text-secondary">&mdash;</span>',
+            "multi_choice_field": '<span class="text-secondary">&mdash;</span>',
+            "json_field": '<pre><code class="language-json">{}</code></pre>',
+            "markdown_field": '<span class="text-secondary">&mdash;</span>',
+        }
+
+        bound_row = location_table.rows[1]
+
+        for col_name, col_expected_value in custom_column_expected_2.items():
+            with self.subTest(col_name=col_name, col_expected_value=col_expected_value):
+                internal_col_name = "cf_" + col_name
+                custom_column = location_table.base_columns.get(internal_col_name)
+                self.assertIsNotNone(custom_column, internal_col_name)
+                self.assertIsInstance(custom_column, CustomFieldColumn)
 
-            rendered_value = bound_row.get_cell(internal_col_name)  # pylint: disable=no-member
-            self.assertEqual(rendered_value, col_expected_value)
+                rendered_value = bound_row.get_cell(internal_col_name)  # pylint: disable=no-member
+                self.assertHTMLEqual(str(rendered_value), str(col_expected_value))
 
 
 class CustomFieldFilterFormTest(TestCase):