nautobot 2.4.16__py3-none-any.whl → 2.4.18__py3-none-any.whl

nautobot/extras/templates/extras/gitrepository.html

@@ -1,82 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_buttons %}
-        {% if perms.extras.change_gitrepository %}
-            <form class="form-inline" style="display: inline-block"
-                  method="post" action="{% url 'extras:gitrepository_dryrun' pk=object.pk %}">
-                {% csrf_token %}
-                <button type="submit" class="btn btn-info">
-                    <i class="mdi mdi-book-refresh" aria-hidden="true"></i> Dry-Run
-                </button>
-            </form>
-            <form class="form-inline" style="display: inline-block"
-                  method="post" action="{% url 'extras:gitrepository_sync' pk=object.pk %}">
-                {% csrf_token %}
-                <button type="submit" class="btn btn-primary">
-                    <i class="mdi mdi-source-branch-sync" aria-hidden="true"></i> Sync
-                </button>
-            </form>
-        {% endif %}
-{% endblock extra_buttons %}
-
-{% block extra_nav_tabs %}
-        <li role="presentation"{% if active_tab == 'result' %} class="active"{% endif %}>
-             <a href="{% url 'extras:gitrepository_result' pk=object.pk %}">Synchronization Status</a>
-        </li>
-{% endblock extra_nav_tabs %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Repository Details</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Remote URL</td>
-                        <td>{{ object.remote_url }}</td>
-                    </tr>
-                    <tr>
-                        <td>Branch</td>
-                        <td>
-                            <code>{{ object.branch }}</code>
-                            {% if object.current_head %}
-                                (checked out locally at commit <code>{{ object.current_head }}</code>)
-                            {% else %}
-                                (not locally checked out yet)
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Secrets Group</td>
-                        <td>{{ object.secrets_group|hyperlinked_object }}</td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Provided Data Types</strong>
-                </div>
-                <table class="table table-hover panel-body">
-                    {% for entry in datasource_contents %}
-                        <tr>
-                            <td>
-                                <span style="display: inline-block" class="label label-info">
-                                    <i class="mdi {{ entry.icon }}"></i>
-                                </span>
-                                {{ entry.name|title }}</td>
-                            <td>
-                                {% if entry.content_identifier in object.provided_contents %}
-                                    {{ True | render_boolean }}
-                                {% else %}
-                                    {{ False | render_boolean }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            </div>
-{% endblock %}
+{% extends 'extras/gitrepository_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/gitrepository_object_edit.html

@@ -1,13 +1,2 @@
-{% extends 'generic/object_create.html' %}
-
-{% block buttons %}
-    {% if editing %}
-        <button type="submit" name="_dryrun_update" class="btn btn-warning">Update & Dry Run</button>
-        <button type="submit" name="_update" class="btn btn-primary">Update & Sync</button>
-    {% else %}
-        <button type="submit" name="_dryrun_create" class="btn btn-info">Create & Dry Run</button>
-        <button type="submit" name="_create" class="btn btn-primary">Create & Sync</button>
-        <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
-    {% endif %}
-    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-{% endblock %}
+{% extends 'extras/gitrepository_update.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/gitrepository_retrieve.html

@@ -0,0 +1,82 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block extra_buttons %}
+        {% if perms.extras.change_gitrepository %}
+            <form class="form-inline" style="display: inline-block"
+                  method="post" action="{% url 'extras:gitrepository_dryrun' pk=object.pk %}">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-info">
+                    <i class="mdi mdi-book-refresh" aria-hidden="true"></i> Dry-Run
+                </button>
+            </form>
+            <form class="form-inline" style="display: inline-block"
+                  method="post" action="{% url 'extras:gitrepository_sync' pk=object.pk %}">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-primary">
+                    <i class="mdi mdi-source-branch-sync" aria-hidden="true"></i> Sync
+                </button>
+            </form>
+        {% endif %}
+{% endblock extra_buttons %}
+
+{% block extra_nav_tabs %}
+        <li role="presentation"{% if active_tab == 'result' %} class="active"{% endif %}>
+             <a href="{% url 'extras:gitrepository_result' pk=object.pk %}">Synchronization Status</a>
+        </li>
+{% endblock extra_nav_tabs %}
+
+{% block content_left_page %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Repository Details</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Remote URL</td>
+                        <td>{{ object.remote_url }}</td>
+                    </tr>
+                    <tr>
+                        <td>Branch</td>
+                        <td>
+                            <code>{{ object.branch }}</code>
+                            {% if object.current_head %}
+                                (checked out locally at commit <code>{{ object.current_head }}</code>)
+                            {% else %}
+                                (not locally checked out yet)
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Secrets Group</td>
+                        <td>{{ object.secrets_group|hyperlinked_object }}</td>
+                    </tr>
+                </table>
+            </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Provided Data Types</strong>
+                </div>
+                <table class="table table-hover panel-body">
+                    {% for entry in datasource_contents %}
+                        <tr>
+                            <td>
+                                <span style="display: inline-block" class="label label-info">
+                                    <i class="mdi {{ entry.icon }}"></i>
+                                </span>
+                                {{ entry.name|title }}</td>
+                            <td>
+                                {% if entry.content_identifier in object.provided_contents %}
+                                    {{ True | render_boolean }}
+                                {% else %}
+                                    {{ False | render_boolean }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+{% endblock %}

nautobot/extras/templates/extras/gitrepository_update.html

@@ -0,0 +1,13 @@
+{% extends 'generic/object_create.html' %}
+
+{% block buttons %}
+    {% if editing %}
+        <button type="submit" name="_dryrun_update" class="btn btn-warning">Update & Dry Run</button>
+        <button type="submit" name="_update" class="btn btn-primary">Update & Sync</button>
+    {% else %}
+        <button type="submit" name="_dryrun_create" class="btn btn-info">Create & Dry Run</button>
+        <button type="submit" name="_create" class="btn btn-primary">Create & Sync</button>
+        <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
+    {% endif %}
+    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
+{% endblock %}

nautobot/extras/templates/extras/inc/job_table.html

@@ -1,4 +1,4 @@
-{% load django_tables2 %}
+{% load querystring from django_tables2 %}
 
 <table id="job_accordion" {% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
     {% if table.show_header %}

nautobot/extras/templates/extras/inc/object_contact_header.html

@@ -6,10 +6,10 @@
             <a href="{% url 'extras:object_contact_team_assign' %}{% querystring request %}">Assign Contact/Team</a>
         </li>
         <li role="presentation"{% if active_tab == 'contact' %} class="active"{% endif %}>
-            <a href="{% url 'extras:object_contact_add' %}{% querystring request %}">New Contact</a>
+            <a href="{% url 'extras:object_contact_add' %}{% legacy_querystring request %}">New Contact</a>
         </li>
         <li role="presentation"{% if active_tab == 'team' %} class="active"{% endif %}>
-            <a href="{% url 'extras:object_team_add' %}{% querystring request %}">New Team</a>
+            <a href="{% url 'extras:object_team_add' %}{% legacy_querystring request %}">New Team</a>
         </li>
     </ul>
 {% endblock %}

nautobot/extras/templates/extras/note_retrieve.html

@@ -1,53 +1 @@
-{% 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 %}
+{% extends 'generic/object_retrieve.html' %}

nautobot/extras/templates/extras/plugin_detail.html

@@ -1,15 +1,11 @@
 {% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
+{% load ui_framework %}
 
 {% block header %}
     <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>
-                    <li><a href="{% url 'apps:app_detail' app=app_data.package %}">{{ app_data.name | bettertitle }}</a></li>
-                {% endblock breadcrumbs %}
-            </ol>
+            {% render_breadcrumbs %}
         </div>
     </div>
     <div class="pull-right noprint">
@@ -32,7 +28,7 @@
         {% endblock buttons %}
     </div>
     {% block masthead %}
-        <h1>{% block title %}{{ app_data.name | bettertitle }}{% endblock %}</h1>
+        <h1>{% block title %}{% render_title %}{% endblock %}</h1>
     {% endblock masthead %}
 {% endblock header %}
 

nautobot/extras/templates/extras/plugins_list.html

@@ -3,8 +3,6 @@
 {% load static %}
 {% load ui_framework %}
 
-{% block document_title %}{% render_title "plain" %}{% endblock %}
-
 {% block content %}
     <div class="row noprint">
         <div class="col-md-12">

nautobot/extras/templates/extras/tag_retrieve.html

@@ -1,2 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/tag_update.html

@@ -1,15 +1,15 @@
-{% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tag</strong></div>
-        <div class="panel-body">
-            {% render_field form.name %}
-            {% render_field form.color %}
-            {% render_field form.description %}
-            {% render_field form.content_types %}
-        </div>
-    </div>
-    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tag</strong></div>
+        <div class="panel-body">
+            {% render_field form.name %}
+            {% render_field form.color %}
+            {% render_field form.description %}
+            {% render_field form.content_types %}
+        </div>
+    </div>
+    {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/extras/templates/extras/team_retrieve.html

@@ -1,2 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/tests/test_dynamicgroups.py

@@ -18,6 +18,7 @@ from nautobot.dcim.models import (
     Device,
     DeviceType,
     FrontPort,
+    InventoryItem,
     Location,
     LocationType,
     Manufacturer,
@@ -107,6 +108,24 @@ class DynamicGroupTestBase(TestCase):
             ),
         ]
 
+        cls.inventory_items = [
+            InventoryItem.objects.create(
+                name="device-location-1-item-1",
+                serial="location-1-item-1",
+                device=cls.devices[0],
+            ),
+            InventoryItem.objects.create(
+                name="device-location-1-item-2",
+                serial="location-1-item-2",
+                device=cls.devices[0],
+            ),
+            InventoryItem.objects.create(
+                name="device-location-2-item-1",
+                serial="location-2-item-1",
+                device=cls.devices[1],
+            ),
+        ]
+
         cls.groups = [
             DynamicGroup.objects.create(
                 name="Parent",
@@ -152,7 +171,13 @@ class DynamicGroupTestBase(TestCase):
             DynamicGroup.objects.create(
                 name="MultiValueCharFilter",
                 description="A group with a multivaluechar filter",
-                filter={"name": ["device-1", "device-2", "device-3"]},
+                filter={"name": ["device-location-1", "device-location-2", "device-location-3"]},
+                content_type=cls.device_ct,
+            ),
+            DynamicGroup.objects.create(
+                name="SearchFilter",
+                description="A group with a search filter",
+                filter={"q": "location-1"},
                 content_type=cls.device_ct,
             ),
         ]
@@ -165,6 +190,8 @@ class DynamicGroupTestBase(TestCase):
         cls.third_child = cls.groups[3]
         cls.nested_child = cls.groups[4]
         cls.no_match_filter = cls.groups[5]
+        cls.multivaluechar_filter = cls.groups[6]
+        cls.search_filter = cls.groups[7]
         cls.invalid_filter = DynamicGroup.objects.create(
             name="Invalid Filter",
             description="A group with a filter that's invalid",
@@ -289,6 +316,9 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         self.assertIn(device1, group.members)
         self.assertNotIn(device2, group.members)
 
+        group = self.search_filter
+        self.assertIn(device1, group.members)
+
     def test_static_member_operations(self):
         sg = DynamicGroup.objects.create(
             name="All Prefixes",
@@ -437,17 +467,24 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
 
     def test_count(self):
         """Test `DynamicGroup.count`."""
-        expected = {
-            self.parent.count: 2,
-            self.first_child.count: 1,
-            self.second_child.count: 1,
-            self.third_child.count: 2,
-            self.nested_child.count: 2,
-            self.no_match_filter.count: 0,
-            self.invalid_filter.count: 0,
-        }
-        for grp, cnt in expected.items():
-            self.assertEqual(grp, cnt)
+        expected = [
+            (self.parent, 1),
+            (self.first_child, 1),
+            (self.second_child, 1),
+            (self.third_child, 2),
+            (self.nested_child, 2),
+            (self.no_match_filter, 0),
+            (self.multivaluechar_filter, 3),
+            (self.search_filter, 1),
+            (self.invalid_filter, 0),
+        ]
+        for grp, cnt in expected:
+            with self.subTest(grp.name):
+                self.assertEqual(grp.count, cnt, list(grp.members.values_list("name", flat=True)))
+                self.assertEqual(grp.members.count(), cnt, list(grp.members.values_list("name", flat=True)))
+                # https://github.com/nautobot/nautobot/issues/7631
+                members = grp.update_cached_members()
+                self.assertEqual(members.count(), cnt, list(members.values_list("name", flat=True)))
 
     def test_model(self):
         """Test `DynamicGroup.model`."""
@@ -635,9 +672,9 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         group1 = self.first_child  # Filter has `location`
         self.assertEqual(group1.get_initial(), group1.filter)
         # Test if MultiValueCharField is properly pre-populated
-        group2 = self.groups[6]  # Filter has `name`
+        group2 = self.multivaluechar_filter  # Filter has `name`
         initial = group2.get_initial()
-        expected = {"name": ["device-1", "device-2", "device-3"]}
+        expected = {"name": ["device-location-1", "device-location-2", "device-location-3"]}
         self.assertEqual(initial, expected)
 
     def test_set_filter(self):
@@ -1152,7 +1189,11 @@ class DynamicGroupMixinModelTest(DynamicGroupTestBase):
         with self.assertNumQueries(1):
             qs = self.devices[0].dynamic_groups
             list(qs)
-        self.assertQuerysetEqualAndNotEmpty(qs, [self.first_child, self.third_child, self.nested_child], ordered=False)
+        self.assertQuerysetEqualAndNotEmpty(
+            qs,
+            [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter],
+            ordered=False,
+        )
 
     def test_dynamic_groups_cached(self):
         for group in self.groups:
@@ -1160,21 +1201,35 @@ class DynamicGroupMixinModelTest(DynamicGroupTestBase):
         with self.assertNumQueries(1):
             qs = self.devices[0].dynamic_groups_cached
             list(qs)
-        self.assertQuerysetEqualAndNotEmpty(qs, [self.first_child, self.third_child, self.nested_child], ordered=False)
+        self.assertQuerysetEqualAndNotEmpty(
+            qs,
+            [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter],
+            ordered=False,
+        )
 
     def test_dynamic_groups_list(self):
         for group in self.groups:
             group.update_cached_members()
         with self.assertNumQueries(1):
             groups = self.devices[0].dynamic_groups_list
-        self.assertEqual(set(groups), set([self.first_child, self.third_child, self.nested_child]))
+        self.assertEqual(
+            set(groups),
+            set(
+                [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter]
+            ),
+        )
 
     def test_dynamic_groups_list_cached(self):
         for group in self.groups:
             group.update_cached_members()
         with self.assertNumQueries(1):
             groups = self.devices[0].dynamic_groups_list_cached
-        self.assertEqual(set(groups), set([self.first_child, self.third_child, self.nested_child]))
+        self.assertEqual(
+            set(groups),
+            set(
+                [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter]
+            ),
+        )
 
 
 class DynamicGroupFilterTest(DynamicGroupTestBase, FilterTestCases.FilterTestCase):