nautobot 2.4.10__py3-none-any.whl → 2.4.12__py3-none-any.whl

nautobot/extras/templates/extras/job_detail.html

@@ -1,327 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-{% load perms %}
-{% load plugins %}
-
-{% block extra_breadcrumbs %}
-    <li>{{ object.grouping }}</li>
-{% endblock extra_breadcrumbs %}
-
-{% block extra_buttons %}
-    {% if perms.extras.run_job %}
-        <a href="{% url 'extras:job_run' pk=object.pk %}" class="btn btn-primary"
-           {% if not object.installed or not object.enabled %}disabled="disabled"{% endif %}>
-            <i class="mdi mdi-play" aria-hidden="true"></i> Run/Schedule
-        </a>
-    {% endif %}
-{% endblock extra_buttons %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Source Code</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Module</td>
-                <td><code>{{ object.module_name }}</code></td>
-            </tr>
-            <tr>
-                <td>Job Class</td>
-                <td><code>{{ object.job_class_name }}</code></td>
-            </tr>
-            <tr>
-                <td>Class Path</td>
-                <td>
-                    <span class="hover_copy">
-                        <span id="job_class_path_copy"><code>{{ object.class_path }}</code></span>
-                        <button class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#job_class_path_copy">
-                            <span class="mdi mdi-content-copy"></span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-            <tr>
-                <td>Installed</td>
-                <td>{{ object.installed | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Is Job Hook Receiver</td>
-                <td>{{ object.is_job_hook_receiver | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Is Job Button Receiver</td>
-                <td>{{ object.is_job_button_receiver | render_boolean }}</td>
-            </tr>
-        </table>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Job</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Grouping</td>
-                <td>{{ object.grouping }}</td>
-                <td>
-                    {% if object.grouping_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                “{{ object.job_class.grouping }}”
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Name</td>
-                <td>{{ object.name }}</td>
-                <td>
-                    {% if object.name_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                “{{ object.job_class.name }}”
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description | render_markdown | placeholder }}</td>
-                <td>
-                    {% if object.description_override %}
-                        <div class="text-muted">
-                            overridden; default is:<br>
-                            {% if object.installed %}
-                                {{ object.job_class.description | render_markdown | placeholder }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Enabled</td>
-                <td>{{ object.enabled | render_boolean }}</td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>Job Results</td>
-                <td>
-                    {% if object.job_results.exists %}
-                        <a href="{% url 'extras:jobresult_list' %}?job_model={{ object.name | urlencode }}">{{ object.job_results.count }}</a>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-                <td></td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Properties</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Approval Required to Execute</td>
-                <td>{{ object.approval_required | render_boolean }}</td>
-                <td>
-                    {% if object.approval_required_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.approval_required | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Supports Dryrun</td>
-                <td colspan="2">{{ object.supports_dryrun | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Default to Dryrun</td>
-                <td>{{ object.dryrun_default | render_boolean }}</td>
-                <td>
-                    {% if object.dryrun_default_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.dryrun_default | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Read-Only Execution</td>
-                <td colspan="2">{{ object.read_only | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Hide from Default UI</td>
-                <td>{{ object.hidden | render_boolean }}</td>
-                <td>
-                    {% if object.hidden_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.hidden | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Has Sensitive Variables</td>
-                <td>{{ object.has_sensitive_variables | render_boolean }}</td>
-                <td>
-                    {% if object.has_sensitive_variables_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.has_sensitive_variables | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Is Singleton</td>
-                <td>{{ object.is_singleton | render_boolean }}</td>
-                <td>
-                    {% if object.is_singleton_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {{ object.job_class.is_singleton | render_boolean }}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Execution Soft Time Limit</td>
-                <td>
-                    {% if object.soft_time_limit > 0 %}
-                        {{ object.soft_time_limit }} seconds
-                    {% else %}
-                        {{ "CELERY_TASK_SOFT_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.soft_time_limit_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {% if object.job_class.soft_time_limit > 0 %}
-                                    {{ object.job_class.soft_time_limit }} seconds
-                                {% else %}
-                                    {{ "CELERY_TASK_SOFT_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Execution Hard Time Limit</td>
-                <td>
-                    {% if object.time_limit > 0 %}
-                        {{ object.time_limit }} seconds
-                    {% else %}
-                        {{ "CELERY_TASK_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.time_limit_override %}
-                        <span class="text-muted">
-                            overridden; default is
-                            {% if object.installed %}
-                                {% if object.job_class.time_limit > 0 %}
-                                    {{ object.job_class.time_limit }} seconds
-                                {% else %}
-                                    {{ "CELERY_TASK_TIME_LIMIT" | settings_or_config }} seconds (system default)
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Job Queues</td>
-                <td>
-                    {% if object.job_queues.exists %}
-                        <ul>
-                            {% for queue in object.job_queues.all %}
-                                <li>{{ queue|hyperlinked_object }}</li>
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if object.job_queues_override %}
-                        <span class="text-muted">
-                            overridden; default is:<br>
-                            {% if object.installed %}
-                                {% include 'extras/inc/json_data.html' with data=object.job_class.task_queues format="json" %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Default Job Queue</td>
-                <td>
-                    {{ object.default_job_queue|hyperlinked_object }}
-                </td>
-                <td>
-                    {% if object.default_job_queue_override %}
-                        <span class="text-muted">
-                            overridden; default is:
-                            {% if object.installed %}
-                                {% if object.job_class.task_queues|length > 1 %}
-                                    {{ object.job_class.task_queues.0 }}
-                                {% else %}
-                                    {{ None|placeholder }}
-                                {% endif %}
-                            {% else %}
-                                unknown (not currently installed)
-                            {% endif %}
-                        </span>
-                    {% endif %}
-                </td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_right_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/job_edit.html

@@ -115,7 +115,7 @@
         const field_name = field_id.slice(3);
         if ($(this).prop("checked")) {
             field.attr("readonly", null);
-            field.attr("disabled", null);
+            field.prop("disabled", false);
         } else {
             /* Revert the field to its default value */
             if (field.attr("type") == "checkbox") {
@@ -131,11 +131,11 @@
                  * Note that "disabled" fields aren't included in form submission, so we have to be sure to
                  * re-enable them at form submission time.
                  */
-                field.attr("disabled", "disabled");
+                field.prop("disabled", true);
             } else {
                 /* Do we have a job class object to derive properties from? */
                 if (job_class_properties != "") {
-                    if (field_name != "job_queues") {
+                    if (field_name != "job_queues" && field_name != "default_job_queue") {
                         field.val(job_class_properties[field_name]);
                     }
                 } else if (field_name != "description") {
@@ -145,17 +145,23 @@
                     /* Textarea fields don't have a "value" attribute */
                     field.val(description_default);
                 }
-                field.attr("readonly", "readonly");
+                if (field_name == "job_queues" || field_name == "default_job_queue") {
+                    field.prop("disabled", true);
+                } else {
+                    field.attr("readonly", "readonly");
+                }
             }
         }
     });
     $("[id^=id_][id$=_override]").change();
 
-    /* As mentioned above, we need to re-enable all checkboxes on form submission so they get included */
+    /* As mentioned above, we need to re-enable all checkboxes, job_queues and default_job_queue fields on form submission so they get included */
     $("form").submit(function() {
         $('input[type="checkbox"]:disabled').each(function() {
-            $(this).attr("disabled", null);
+            $(this).prop("disabled", false);
         });
+        $('#id_job_queues').prop("disabled", false);
+        $('#id_default_job_queues').prop("disabled", false);
     });
 </script>
 {% endblock javascript %}

nautobot/extras/templates/extras/tag.html

@@ -1,52 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Tag</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Name</td>
-                        <td>
-                            {{ object.name }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Tagged Items</td>
-                        <td>
-                            {{ items_count }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Color</td>
-                        <td>
-                            <span class="label color-block" style="background-color: #{{ object.color }}">&nbsp;</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Content Type(s)</td>
-                        <td>
-                            <ul class="list-unstyled">
-                                {% for ct in content_types %}
-                                    <li>{{ ct }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>
-                            {{ object.description|placeholder }}
-                        </td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            {% include 'panel_table.html' with table=items_table heading='Tagged Objects' %}
-            {% include 'inc/paginator.html' with paginator=items_table.paginator page=items_table.page %}
-            <div class="row"></div>
-{% endblock content_right_page %}
+{% extends 'extras/tag_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_edit.html

@@ -1,15 +1,2 @@
-{% 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 %}
+{% extends 'extras/tag_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/tag_retrieve.html

@@ -0,0 +1,2 @@
+{% 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

@@ -0,0 +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' %}
+{% endblock %}

nautobot/extras/templates/extras/team_retrieve.html

@@ -1,2 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% 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_api.py

@@ -1529,7 +1529,7 @@ class JobTest(
         mock_get_worker_count.return_value = 1
         obj_perm = ObjectPermission(
             name="Test permission",
-            constraints={"module_name__in": ["pass", "fail"]},
+            constraints={"module_name__in": ["pass_job", "fail"]},
             actions=["run"],
         )
         obj_perm.save()
@@ -1543,10 +1543,10 @@ class JobTest(
         self.assertHttpStatus(response, status.HTTP_404_NOT_FOUND)
 
         # Try post to permitted job
-        job_model = Job.objects.get_for_class_path("pass.TestPassJob")
+        job_model = Job.objects.get_for_class_path("pass_job.TestPassJob")
         job_model.enabled = True
         job_model.validated_save()
-        url = self.get_run_url("pass.TestPassJob")
+        url = self.get_run_url("pass_job.TestPassJob")
         response = self.client.post(url, **self.header)
         self.assertHttpStatus(response, self.run_success_response_status)
 
@@ -1702,7 +1702,7 @@ class JobTest(
         # Assert that we have an immediate ScheduledJob and that it matches the job_model.
         schedule = ScheduledJob.objects.last()
         self.assertIsNotNone(schedule)
-        self.assertEqual(schedule.interval, JobExecutionType.TYPE_IMMEDIATELY)
+        self.assertEqual(schedule.interval, JobExecutionType.TYPE_FUTURE)
         self.assertEqual(schedule.approval_required, self.job_model.approval_required)
         self.assertEqual(schedule.kwargs["var4"], str(device_role.pk))
 
@@ -2136,7 +2136,7 @@ class JobTest(
     @mock.patch("nautobot.extras.api.views.get_worker_count", return_value=1)
     def test_run_job_with_default_queue_with_empty_job_model_job_queues(self, _):
         self.add_permissions("extras.run_job")
-        job_model = Job.objects.get_for_class_path("pass.TestPassJob")
+        job_model = Job.objects.get_for_class_path("pass_job.TestPassJob")
         data = {
             "task_queue": job_model.default_job_queue.name,
         }
@@ -2144,7 +2144,7 @@ class JobTest(
         job_model.job_queues.set([])
         job_model.enabled = True
         job_model.validated_save()
-        url = self.get_run_url("pass.TestPassJob")
+        url = self.get_run_url("pass_job.TestPassJob")
         response = self.client.post(url, data, format="json", **self.header)
         self.assertHttpStatus(response, self.run_success_response_status)
 
@@ -2571,10 +2571,10 @@ class ScheduledJobTest(
     @classmethod
     def setUpTestData(cls):
         user = User.objects.create(username="user1", is_active=True)
-        job_model = Job.objects.get_for_class_path("pass.TestPassJob")
+        job_model = Job.objects.get_for_class_path("pass_job.TestPassJob")
         ScheduledJob.objects.create(
             name="test1",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=job_model,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=user,
@@ -2583,7 +2583,7 @@ class ScheduledJobTest(
         )
         ScheduledJob.objects.create(
             name="test2",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=job_model,
             interval=JobExecutionType.TYPE_DAILY,
             user=user,
@@ -2593,7 +2593,7 @@ class ScheduledJobTest(
         )
         ScheduledJob.objects.create(
             name="test3",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=job_model,
             interval=JobExecutionType.TYPE_CUSTOM,
             crontab="34 12 * * *",
@@ -2608,12 +2608,12 @@ class JobApprovalTest(APITestCase):
     @classmethod
     def setUpTestData(cls):
         cls.additional_user = User.objects.create(username="user1", is_active=True)
-        cls.job_model = Job.objects.get_for_class_path("pass.TestPassJob")
+        cls.job_model = Job.objects.get_for_class_path("pass_job.TestPassJob")
         cls.job_model.enabled = True
         cls.job_model.save()
         cls.scheduled_job = ScheduledJob.objects.create(
             name="test pass",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=cls.job_model,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=cls.additional_user,
@@ -2666,7 +2666,7 @@ class JobApprovalTest(APITestCase):
         self.add_permissions("extras.approve_job", "extras.view_scheduledjob", "extras.change_scheduledjob")
         scheduled_job = ScheduledJob.objects.create(
             name="test",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=self.job_model,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
@@ -2689,7 +2689,7 @@ class JobApprovalTest(APITestCase):
         self.add_permissions("extras.approve_job", "extras.view_scheduledjob", "extras.change_scheduledjob")
         scheduled_job = ScheduledJob.objects.create(
             name="test",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=self.job_model,
             interval=JobExecutionType.TYPE_FUTURE,
             one_off=True,
@@ -2706,7 +2706,7 @@ class JobApprovalTest(APITestCase):
         self.add_permissions("extras.approve_job", "extras.view_scheduledjob", "extras.change_scheduledjob")
         scheduled_job = ScheduledJob.objects.create(
             name="test",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=self.job_model,
             interval=JobExecutionType.TYPE_FUTURE,
             one_off=True,

nautobot/extras/tests/test_filters.py

@@ -994,11 +994,11 @@ class JobResultFilterSetTestCase(FilterTestCases.FilterTestCase):
         jobs = Job.objects.all()[:3]
         cls.jobs = jobs
         user = User.objects.create(username="user1", is_active=True)
-        job_model = Job.objects.get_for_class_path("pass.TestPassJob")
+        job_model = Job.objects.get_for_class_path("pass_job.TestPassJob")
         scheduled_jobs = [
             ScheduledJob.objects.create(
                 name="test1",
-                task="pass.TestPassJob",
+                task="pass_job.TestPassJob",
                 job_model=job_model,
                 interval=JobExecutionType.TYPE_IMMEDIATELY,
                 user=user,
@@ -1007,7 +1007,7 @@ class JobResultFilterSetTestCase(FilterTestCases.FilterTestCase):
             ),
             ScheduledJob.objects.create(
                 name="test2",
-                task="pass.TestPassJob",
+                task="pass_job.TestPassJob",
                 job_model=job_model,
                 interval=JobExecutionType.TYPE_DAILY,
                 user=user,
@@ -1017,7 +1017,7 @@ class JobResultFilterSetTestCase(FilterTestCases.FilterTestCase):
             ),
             ScheduledJob.objects.create(
                 name="test3",
-                task="pass.TestPassJob",
+                task="pass_job.TestPassJob",
                 job_model=job_model,
                 interval=JobExecutionType.TYPE_CUSTOM,
                 crontab="34 12 * * *",