nautobot 2.4.14__py3-none-any.whl → 2.4.15__py3-none-any.whl

nautobot/extras/templates/extras/note_retrieve.html

@@ -0,0 +1,53 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load buttons %}
+{% load plugins %}
+{% load perms %}
+{% load helpers %}
+
+{% block breadcrumbs %}
+    <li><a href="{% url 'extras:note_list' %}">Notes</a></li>
+    {% if object.assigned_object.get_absolute_url %}
+        <li><a href="{{ object.assigned_object.get_absolute_url }}notes/">{{ object.assigned_object }}</a></li>
+    {% endif %}
+    <li>{{ object }}</li>
+{% endblock breadcrumbs %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-5">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Note</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>User</td>
+                        <td>
+                            {{ object.user|default:object.user_name }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Object Type</td>
+                        <td>
+                            {{ object.assigned_object_type }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Object</td>
+                        <td>
+                            {{ object.assigned_object | hyperlinked_object }}
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Text</strong>
+                </div>
+                <div class="panel-body rendered-markdown">
+                    {{ object.note|render_markdown }}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

nautobot/extras/templates/extras/plugins_list.html

@@ -1,15 +1,14 @@
 {% extends "base.html" %}
 {% load helpers %}
 {% load static %}
+{% load ui_framework %}
+
+{% block document_title %}{% render_title "plain" %}{% endblock %}
 
 {% block content %}
     <div class="row noprint">
         <div class="col-md-12">
-            <ol class="breadcrumb">
-                {% block breadcrumbs %}
-                    <li><a href="{% url 'apps:apps_list' %}">Installed Apps</a></li>
-                {% endblock breadcrumbs %}
-            </ol>
+            {% render_breadcrumbs %}
         </div>
     </div>
 
@@ -34,7 +33,7 @@
         <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
     </div>
 
-    <h1>{% block title %}Installed Apps{% endblock %}</h1>
+    <h1>{% block page_heading %}{% render_title %}{% endblock %}</h1>
 
     <div class="row">
         <div class="col-md-12">

nautobot/extras/templatetags/custom_links.py

@@ -40,7 +40,7 @@ def custom_links(context, obj):
         "user": context["user"],  # django.contrib.auth.context_processors.auth
         "perms": context["perms"],  # django.contrib.auth.context_processors.auth
     }
-    template_code = mark_safe("")  # noqa: S308  # suspicious-mark-safe-usage -- this one is safe
+    template_code = mark_safe("")
     group_names = OrderedDict()
 
     for cl in links:
@@ -70,7 +70,7 @@ def custom_links(context, obj):
 
     # Add grouped links to template
     for group, links in group_names.items():
-        links_rendered = mark_safe("")  # noqa: S308  # suspicious-mark-safe-usage -- this one is safe
+        links_rendered = mark_safe("")
 
         for cl in links:
             try:

nautobot/extras/templatetags/job_buttons.py

@@ -71,7 +71,7 @@ CONFIRM_MODAL = """
 </div>
 """
 
-SAFE_EMPTY_STR = mark_safe("")  # noqa: S308  # suspicious-mark-safe-usage -- this one is safe
+SAFE_EMPTY_STR = mark_safe("")
 
 
 def _render_job_button_for_obj(job_button, obj, context, content_type):

nautobot/extras/templatetags/plugins.py

@@ -50,7 +50,7 @@ def _get_registered_content(obj, method, template_context, return_html=True):
         content = getattr(instance, method)()
         if not return_html:
             for i, content in enumerate(content):
-                objects.append({f"{plugin_name}:{i+1}": content})
+                objects.append({f"{plugin_name}:{i + 1}": content})
         else:
             html += content
 

nautobot/extras/tests/integration/test_computedfields.py

@@ -40,7 +40,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         and checks it appears ONLY there!.
         """
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": self.device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': self.device.pk})}")
         # Check the computed field appears in the primary information tab
         self.assertTrue(self.browser.is_text_present("Device Computed Field"))
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
@@ -52,7 +52,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         self.computed_field.advanced_ui = True
         self.computed_field.save()
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": self.device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': self.device.pk})}")
         # Check the computed field does NOT appear in the primary information tab
         self.assertFalse(self.browser.is_text_present("Device Computed Field"))
         self.assertFalse(self.browser.is_text_present(f"{self.device.name} is awesome!"))

nautobot/extras/tests/integration/test_customfields.py

@@ -96,12 +96,13 @@ class CustomFieldTestCase(SeleniumTestCase):
 
     def test_fail_create_invalid_type_with_choices(self):
         """Test fail type!=select with choices."""
+        cf_label = "Test Text"
         with self.assertRaises(AssertionError):
-            self._create_custom_field(field_label="Test Text", field_type="text", choices=["bad1"])
+            self._create_custom_field(field_label=cf_label, field_type="text", choices=["bad1"])
 
         # Assert error state
-        self.assertTrue(self.browser.is_text_present("Editing custom field"))
-        self.assertTrue(self.browser.is_text_present("Errors encountered when saving custom field choices"))
+        self.assertTrue(self.browser.is_text_present("Add a new custom field"))
+        self.assertTrue(self.browser.is_text_present(f"{cf_label} failed validation"))
         self.assertTrue(self.browser.is_text_present("Custom field choices can only be assigned to selection fields"))
 
     def test_create_type_select_with_choices_adding_dynamic_row(self):
@@ -133,7 +134,8 @@ class CustomFieldTestCase(SeleniumTestCase):
         choices = ["replace_me"]
 
         # Create the field
-        self._create_custom_field(field_label="Test Select", field_type="select", choices=choices)
+        cf_label = "Test Select"
+        self._create_custom_field(field_label=cf_label, field_type="select", choices=choices)
         detail_url = self.browser.url
 
         #
@@ -148,7 +150,8 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.browser.fill("custom_field_choices-0-value", "")
         self.assertEqual(self.browser.find_by_name("custom_field_choices-0-value").value, "")
         self.browser.find_by_text("Update").click()
-        self.assertTrue(self.browser.is_text_present("Errors encountered when saving custom field choices"))
+        self.assertTrue(self.browser.is_text_present(f"{cf_label} failed validation"))
+        self.assertTrue(self.browser.is_text_present("This field is required."))
 
         #
         # Pass updating existing choice (changing value of existing choice)
@@ -208,7 +211,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         device.cf[custom_field.key] = "This is some testing text"
         device.validated_save()
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the custom field appears in the primary information tab
         self.assertTrue(self.browser.is_text_present("Device Custom Field"))
         self.assertTrue(self.browser.is_text_present("This is some testing text"))
@@ -220,7 +223,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         custom_field.advanced_ui = True
         custom_field.save()
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the custom field does NOT appear in the primary information tab
         self.assertFalse(self.browser.is_text_present("Device Custom Field"))
         self.assertFalse(self.browser.is_text_present("This is some testing text"))
@@ -245,7 +248,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         device_content_type = ContentType.objects.get_for_model(Device)
         custom_field.content_types.set([device_content_type])
         # Visit the device edit page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device_edit", kwargs={"pk": self.device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': self.device.pk})}")
         self.browser.find_by_id("id_cf_test_valid_json_field").first.type("test")
         active_web_element = self.browser.driver.switch_to.active_element
         # Type invalid JSON data into the form
@@ -271,7 +274,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         device_content_type = ContentType.objects.get_for_model(Device)
         custom_field.content_types.set([device_content_type])
         # Visit the device edit page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device_edit", kwargs={"pk": self.device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': self.device.pk})}")
         self.browser.find_by_id("id_cf_test_invalid_json_field").first.type("test")
         active_web_element = self.browser.driver.switch_to.active_element
         # Type invalid JSON data into the form
@@ -303,7 +306,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         device_content_type = ContentType.objects.get_for_model(Device)
         custom_field.content_types.set([device_content_type])
         # Visit the device edit page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device_edit", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': device.pk})}")
         # Get the first item selected on the custom field
         self.browser.find_by_xpath(".//label[contains(text(), 'Device Selection Field')]").click()
         active_web_element = self.browser.driver.switch_to.active_element
@@ -325,7 +328,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.browser.find_by_xpath(".//button[contains(text(), 'Confirm')]").click()
 
         # Visit the device edit page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device_edit", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': device.pk})}")
         # Click update button
         self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
         # Check successful redirect to device object page

nautobot/extras/tests/integration/test_dynamicgroups.py

@@ -79,6 +79,6 @@ class DynamicGroupTestCase(SeleniumTestCase):
 
         # Verify dynamic group shows up on device detail tab
         self.browser.visit(
-            f'{self.live_server_url}{reverse("dcim:device_dynamicgroups", kwargs={"pk": devices[0].pk})}'
+            f"{self.live_server_url}{reverse('dcim:device_dynamicgroups', kwargs={'pk': devices[0].pk})}"
         )
         self.assertTrue(self.browser.is_text_present(name))

nautobot/extras/tests/integration/test_notes.py

@@ -29,7 +29,7 @@ class NoteTestCase(SeleniumTestCase):
         location = Location.objects.create(name="Location 1", location_type=location_type, status=location_status)
 
         # Navigate to the created location.
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:location", kwargs={"pk": location.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:location', kwargs={'pk': location.pk})}")
 
         # Verify notes tab shows up and click it.
         self.assertTrue(self.browser.links.find_by_partial_href(f"/dcim/locations/{location.pk}/notes/"))

nautobot/extras/tests/integration/test_plugins.py

@@ -134,13 +134,13 @@ class AppDocumentationTest(SeleniumTestCase):
 
     def test_object_edit_help_provided(self):
         """The ExampleModel object provides model documentation, this test ensures the help link is rendered."""
-        self.browser.visit(f'{self.live_server_url}{reverse("plugins:example_app:examplemodel_add")}')
+        self.browser.visit(f"{self.live_server_url}{reverse('plugins:example_app:examplemodel_add')}")
 
         self.assertTrue(self.browser.links.find_by_partial_href("example_app/docs/models/examplemodel.html"))
 
     def test_object_edit_help_not_provided(self):
         """The AnotherExampleModel object doesn't provide model documentation, this test ensures no help link is provided."""
-        self.browser.visit(f'{self.live_server_url}{reverse("plugins:example_app:anotherexamplemodel_add")}')
+        self.browser.visit(f"{self.live_server_url}{reverse('plugins:example_app:anotherexamplemodel_add')}")
 
         self.assertFalse(self.browser.links.find_by_partial_href("example_app/docs/models/anotherexamplemodel.html"))
 
@@ -158,13 +158,13 @@ class AppReturnUrlTestCase(SeleniumTestCase):
 
     def test_app_return_url(self):
         """This test ensures that Apps return url for new objects is the list view."""
-        self.browser.visit(f'{self.live_server_url}{reverse("plugins:example_app:examplemodel_add")}')
+        self.browser.visit(f"{self.live_server_url}{reverse('plugins:example_app:examplemodel_add')}")
 
         form = self.browser.find_by_tag("form")
 
         # Check that the Cancel button is a link to the examplemodel_list view.
         element = form.first.links.find_by_text("Cancel").first
-        self.assertEqual(element["href"], f'{self.live_server_url}{reverse("plugins:example_app:examplemodel_list")}')
+        self.assertEqual(element["href"], f"{self.live_server_url}{reverse('plugins:example_app:examplemodel_list')}")
 
 
 class AppTabsTestCase(SeleniumTestCase):
@@ -193,7 +193,7 @@ class AppTabsTestCase(SeleniumTestCase):
             status=status,
         )
         # Visit the circuit's detail page and check that the tab is visible
-        self.browser.visit(f'{self.live_server_url}{reverse("circuits:circuit", args=[str(circuit.pk)])}')
+        self.browser.visit(f"{self.live_server_url}{reverse('circuits:circuit', args=[str(circuit.pk)])}")
         self.assertTrue(self.browser.is_text_present("App Tab"))
         # Visit the tab link and check the view content
         self.browser.links.find_by_partial_text("Example App Tab")[0].click()
@@ -210,7 +210,7 @@ class AppTabsTestCase(SeleniumTestCase):
         # Set up the required objects:
         device = create_test_device("Test Device")
         # Visit the device's detail page and check that the tab is visible
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", args=[str(device.pk)])}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', args=[str(device.pk)])}")
         for tab_i in [1, 2]:
             self.assertTrue(self.browser.is_text_present(f"Example App Tab {tab_i}"))
             # Visit the tab link and check the view content

nautobot/extras/tests/integration/test_relationships.py

@@ -51,7 +51,7 @@ class RelationshipsTestCase(SeleniumTestCase):
             destination=power_panel,
         )
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship appears in the primary information tab
         self.assertTrue(self.browser.is_text_present("power panel"))
         self.assertTrue(self.browser.is_text_present("Power Panel"))
@@ -63,7 +63,7 @@ class RelationshipsTestCase(SeleniumTestCase):
         relationship.advanced_ui = True
         relationship.save()
         # Visit the device detail page
-        self.browser.visit(f'{self.live_server_url}{reverse("dcim:device", kwargs={"pk": device.pk})}')
+        self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship does NOT appear in the primary information tab
         self.assertFalse(self.browser.is_text_present("power panel"))
         self.assertFalse(self.browser.is_text_present("Power Panel"))

nautobot/extras/tests/test_filters.py

@@ -171,6 +171,8 @@ class ComputedFieldTestCase(FilterTestCases.FilterTestCase):
     def test_content_type(self):
         params = {"content_type": "dcim.location"}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+        params = {"content_type__n": "dcim.location"}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
 
 class ConfigContextTestCase(FilterTestCases.FilterTestCase):
@@ -650,6 +652,8 @@ class ExportTemplateTestCase(FilterTestCases.FilterTestCase):
     def test_content_type(self):
         params = {"content_type": ContentType.objects.get(model="location").pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+        params = {"content_type__n": ContentType.objects.get(model="location").pk}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class FileProxyTestCase(FilterTestCases.FilterTestCase):
@@ -865,6 +869,8 @@ class ImageAttachmentTestCase(FilterTestCases.FilterTestCase):
     def test_content_type(self):
         params = {"content_type": "dcim.location"}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {"content_type__n": "dcim.location"}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_content_type_id_and_object_id(self):
         params = {
@@ -981,6 +987,7 @@ class JobResultFilterSetTestCase(FilterTestCases.FilterTestCase):
     filterset = JobResultFilterSet
     generic_filter_tests = (
         ("date_created",),
+        ("date_started",),
         ("date_done",),
         ("job_model", "job_model__id"),
         ("job_model", "job_model__name"),
@@ -1091,6 +1098,8 @@ class JobHookFilterSetTestCase(FilterTestCases.FilterTestCase):
     def test_content_types(self):
         params = {"content_types": ["dcim.devicetype"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {"content_types__n": ["dcim.devicetype"]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_enabled(self):
         params = {"enabled": True}

nautobot/extras/tests/test_forms.py

@@ -1101,9 +1101,9 @@ class DeprecatedAliasesTestCase(TestCase):
 
     def test_deprecated_form_mixin_classes(self):
         # Importing these mixin classes doesn't directly warn, but subclassing them does.
-        from nautobot.extras.forms import (
+        from nautobot.extras.forms import CustomFieldBulkCreateForm
+        from nautobot.extras.forms.mixins import (
             AddRemoveTagsForm,
-            CustomFieldBulkCreateForm,
             CustomFieldBulkEditForm,
             CustomFieldModelForm,
             RelationshipModelForm,

nautobot/extras/tests/test_plugins.py

@@ -888,11 +888,10 @@ class TestAppCoreViewOverrides(TestCase):
         self.assertEqual("Hello world! I'm an overridden view.", response.content.decode(response.charset))
 
         response = self.client.get(
-            f'{reverse("plugins:plugin_detail", kwargs={"plugin": "example_app_with_view_override"})}'
+            f"{reverse('plugins:plugin_detail', kwargs={'plugin': 'example_app_with_view_override'})}"
         )
         self.assertIn(
-            "plugins:example_app:view_to_be_overridden <code>"
-            "example_app_with_view_override.views.ViewOverride</code>",
+            "plugins:example_app:view_to_be_overridden <code>example_app_with_view_override.views.ViewOverride</code>",
             extract_page_body(response.content.decode(response.charset)),
         )
 

nautobot/extras/tests/test_relationships.py

@@ -1670,7 +1670,7 @@ class RequiredRelationshipTestMixin:
                     response = self.send_data(
                         from_model,
                         {
-                            "name": f'{params["create_data"]["name"]} edited',
+                            "name": f"{params['create_data']['name']} edited",
                             "relationships": {},
                         },
                         interact_with,
@@ -1688,13 +1688,13 @@ class RequiredRelationshipTestMixin:
                     # Object is updated with the required relationship data (succeeds)
                     response = self.send_data(
                         from_model,
-                        {"name": f'{params["create_data"]["name"]} edited', **related_objects_data},
+                        {"name": f"{params['create_data']['name']} edited", **related_objects_data},
                         interact_with,
                         action="edit",
                         url_kwargs={"pk": newly_created_object.pk},
                     )
                     self.assertHttpStatus(response, 200)
-                    self.assertEqual(f'{params["create_data"]["name"]} edited', response.json()["name"])
+                    self.assertEqual(f"{params['create_data']['name']} edited", response.json()["name"])
 
                     """
                     - Object is created with the required relationship data (succeeds)
@@ -1704,7 +1704,7 @@ class RequiredRelationshipTestMixin:
                     """
 
                     # Delete the object that was previously created, so we can test with the same data again
-                    from_model.objects.get(name=f'{params["create_data"]["name"]} edited').delete()
+                    from_model.objects.get(name=f"{params['create_data']['name']} edited").delete()
                     self.assertEqual(from_model.objects.count(), existing_count)
 
                     # Object is created with the required relationship data (succeeds)
@@ -1718,19 +1718,19 @@ class RequiredRelationshipTestMixin:
                     newly_created_object = from_model.objects.get(name=params["create_data"]["name"])
                     response = self.send_data(
                         from_model,
-                        {"name": f'{params["create_data"]["name"]} changed'},
+                        {"name": f"{params['create_data']['name']} changed"},
                         interact_with,
                         action="edit",
                         url_kwargs={"pk": newly_created_object.pk},
                     )
                     self.assertHttpStatus(response, 200)
-                    self.assertEqual(f'{params["create_data"]["name"]} changed', response.json()["name"])
+                    self.assertEqual(f"{params['create_data']['name']} changed", response.json()["name"])
 
                     # Object is updated to remove the relationship data (fails)
                     response = self.send_data(
                         from_model,
                         {
-                            "name": f'{params["create_data"]["name"]} changed again',
+                            "name": f"{params['create_data']['name']} changed again",
                             "relationships": {},
                         },
                         interact_with,