nautobot 2.2.9__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/extras/templates/extras/job.html

@@ -28,7 +28,7 @@
     <div class="tab-content">
         <div role="tabpanel" class="tab-pane active" id="run">
             <div class="row">
-                <div class="col-md-6 col-md-offset-3">
+                <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                     {% if not perms.extras.run_job %}
                         <div class="alert alert-warning">
                             <i class="mdi mdi-alert"></i>

nautobot/extras/templates/extras/jobresult.html

@@ -66,9 +66,6 @@
 {% endblock %}
 
 {% block extra_nav_tabs %}
-    <li role="presentation">
-        <a href="#json" role="tab" data-toggle="tab">Additional Data</a>
-    </li>
     {% if result.data.output %}
         <li role="presentation">
             <a href="#output" role="tab" data-toggle="tab">Output</a>
@@ -80,79 +77,68 @@
     {% include 'extras/inc/jobresult.html' with result=result log_table=log_table %}
 {% endblock content_full_width_page %}
 
-{% block extra_tab_content %}
-    <div role="tabpanel" class="tab-pane" id="json">
-        <div class="row">
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Positional Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.task_args format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Keyword Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.task_kwargs format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Job Celery Keyword Arguments</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.celery_kwargs format="json" %}
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Return Data</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.result format="json" %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>File Output(s)</strong>
-                    </div>
-                    <div class="panel-body">
-                        <ul>
-                            {% for file_proxy in result.files.all %}
-                                {% if file_proxy.file %}
-                                    <li>
-                                        <a
-                                        {% if settings.JOB_FILE_IO_STORAGE == "db_file_storage.storage.DatabaseFileStorage" %}
-                                            href="{% url "db_file_storage.download_file" %}?name={{ file_proxy.file }}"
-                                        {% else %}
-                                            href="{{ file_proxy.file.url }}"
-                                        {% endif %}
-                                            download="{{ file_proxy.name }}">
-                                            {{ file_proxy.name }}
-                                        </a>
-                                    </li>
-                                {% endif %}
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Traceback</strong>
-                    </div>
-                    <div class="panel-body">
-                        {% include 'extras/inc/json_data.html' with data=result.traceback format="python" %}
-                    </div>
-                </div>
-            </div>
+{% block advanced_content_left_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Keyword Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.task_kwargs format="json" %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Positional Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.task_args format="json" %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Job Celery Keyword Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.celery_kwargs format="json" %}
         </div>
     </div>
+{% endblock advanced_content_left_page %}
+{% block advanced_content_right_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Worker</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tbody>
+                <tr>
+                    <td>Worker Hostname</td>
+                    <td>{{ result.worker }}</td>
+                </tr>
+                <tr>
+                    <td>Queue</td>
+                    <td>{{ result.celery_kwargs.queue}}</td>
+                </tr>
+                <tr>
+                    <td>Task Name</td>
+                    <td>{{ result.task_name }}</td>
+                </tr>
+                <tr>
+                    <td>Meta</td>
+                    <td>{% include 'extras/inc/json_data.html' with data=result.meta format="json" %}</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Traceback</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=result.traceback format="python" %}
+        </div>
+    </div>
+{% endblock advanced_content_right_page %}
+{% block extra_tab_content %}
     {% if result.data.output %}
         <div role="tabpanel" class="tab-pane" id="output">
             <pre>{{ result.data.output }}</pre>
@@ -160,6 +146,7 @@
     {% endif %}
 {% endblock extra_tab_content %}
 
+
 {% block javascript %}
     {{ block.super }}
     {% include 'extras/inc/jobresult_js.html' with result=result %}

nautobot/extras/templates/extras/metadatatype_create.html

@@ -0,0 +1,89 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+{% load static %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Metadata Type</strong></div>
+        <div class="panel-body">
+            {% render_field form.name %}
+            {% render_field form.description %}
+            {% render_field form.data_type %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.content_types %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Choices (select and multi-select data types)</strong></div>
+        <div class="panel-body">
+            {{ choices.non_field_errors }}
+            <table class="table" id="metadata-choices">
+                {{ choices.management_form }}
+                {% for choice in choices.forms %}
+                    {% if forloop.first %}
+                        <thead>
+                        <tr>
+                            {% for field in choice.visible_fields %}
+                                <th>{{ field.label|capfirst }}</th>
+                            {% endfor %}
+                        </tr>
+                        </thead>
+                    {% endif %}
+                    <tr class="formset_row-{{ choices.prefix }}">
+                        {% for field in choice.visible_fields %}
+                            <td>
+                                {# Include the hidden fields in the form #}
+                                {% if forloop.first %}
+                                    {% for hidden in choice.hidden_fields %}
+                                        {{ hidden }}
+                                    {% endfor %}
+                                {% endif %}
+                                {{ field }}
+                                {% if field.errors %}
+                                    <ul>
+                                        {% for error in field.errors %}
+                                            {# Embed an HTML comment indicating the error for extraction by tests #}
+                                            <!-- FORM-ERROR {{ field.name }}: {{ error }} -->
+                                            <li class="text-danger">{{ error }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                {% endif %}
+                            </td>
+                        {% endfor %}
+                    </tr>
+                    {% if choice.errors %}
+                        <tr>
+                            <td colspan="3">
+                                <div class="text-danger">
+                                    {% for error in choice.errors.values %}{{ error }}{% endfor %}
+                                </div>
+                            </td>
+                        </tr>
+                    {% endif %}
+               {% endfor %}
+            </table>
+        </div>
+    </div>
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock form %}
+
+{% block javascript %}
+{{ block.super }}
+<script src="{% static 'jquery/jquery.formset.js' %}"></script>
+<script type="text/javascript">
+    $('.formset_row-{{ choices.prefix }}').formset({
+        addText: '<span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add another Choice',
+        addCssClass: 'btn btn-primary add-row',
+        deleteText: '<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>',
+        deleteCssClass: 'btn btn-danger delete-row',
+        prefix: '{{ choices.prefix }}',
+        formCssClass: 'dynamic-formset-{{ choices.prefix }}',
+        keepFieldValues: 'input[type="number"]',
+        added: jsify_form
+    });
+</script>
+{% endblock javascript %}

nautobot/extras/templates/extras/metadatatype_retrieve.html

@@ -0,0 +1,67 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Metadata Type</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Name</td>
+                <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+                <td>Description</td>
+                <td>{{ object.description|placeholder }}</td>
+            </tr>
+            <tr>
+                <td>Data Type</td>
+                <td>{{ object.get_data_type_display }}</td>
+            </tr>
+        </table>
+    </div>
+    {% if object.choices.exists %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Choices</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <thead>
+                    <tr>
+                        <th>Value</th>
+                        <th>Weight</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for choice in object.choices.all %}
+                        <tr>
+                            <td>{{ choice.value }}</td>
+                            <td>{{ choice.weight }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    {% endif %}
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Assignment</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Content Types</td>
+                <td>
+                    <ul>
+                        {% for ct in object.content_types.all %}
+                            <li>{{ ct }}</li>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+        </table>
+    </div>
+{% endblock content_right_page %}

nautobot/extras/templates/extras/object_dynamicgroups.html

@@ -5,6 +5,13 @@
 {% block title %}{{ block.super }} - Dynamic Groups{% endblock %}
 
 {% block content %}
+    <div class="alert alert-warning">
+        Dynamic group membership is cached for performance reasons, therefore this page may not always be up-to-date.
+        <br>You can refresh the membership of any specific group by viewing it from the list below or from the
+        <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+        <br>You can also refresh the membership of all groups by running the
+        <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+    </div>
     {% include 'responsive_table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}

nautobot/extras/templates/extras/objectchange_list.html

@@ -1,15 +1,3 @@
 {% extends 'generic/object_list.html' %}
-{% load helpers %}
 
 {% block title %}Change Log{% endblock %}
-
-{% block header_extra %}
-    <div class="text-muted">
-        Change log retention:
-        {% if "CHANGELOG_RETENTION"|settings_or_config %}
-            {{ "CHANGELOG_RETENTION"|settings_or_config }} days
-        {% else %}
-            Indefinite
-        {% endif %}
-    </div>
-{% endblock %}

nautobot/extras/templates/extras/plugins_list.html

@@ -5,9 +5,7 @@
 {% block content %}
     <div class="pull-right noprint">
         {% if request.user.is_authenticated and table_config_form %}
-            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#ObjectTable_config" title="Configure table">
-                <i class="mdi mdi-cog"></i> Configure</button>
-            </button>
+            {% table_config_button table table_name="ObjectTable" %}
         {% endif %}
     </div>
 

nautobot/extras/templates/extras/role_retrieve.html

@@ -62,6 +62,22 @@
         </div>
     {% include 'inc/paginator.html' with paginator=device_table.paginator page=device_table.page %}
     {% endif %}
+    {% if interface_table %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Interfaces</strong>
+            </div>
+            {% include 'inc/table.html' with table=interface_table %}
+            {% if perms.dcim.add_interface %}
+                <div class="panel-footer text-right noprint">
+                    <a href="{% url 'dcim:interface_add' %}?role={{ object.pk }}" class="btn btn-xs btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Interface
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+    {% include 'inc/paginator.html' with paginator=interface_table.paginator page=interface_table.page %}
+    {% endif %}
     {% if rack_table %}
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -126,6 +142,22 @@
         </div>
     {% include 'inc/paginator.html' with paginator=virtual_machine_table.paginator page=virtual_machine_table.page %}
     {% endif %}
+    {% if vminterface_table %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>VM Interfaces</strong>
+            </div>
+            {% include 'inc/table.html' with table=vminterface_table %}
+            {% if perms.virtualization.add_vminterface %}
+                <div class="panel-footer text-right noprint">
+                    <a href="{% url 'virtualization:vminterface_add' %}?role={{ object.pk }}" class="btn btn-xs btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VM Interface
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+    {% include 'inc/paginator.html' with paginator=vminterface_table.paginator page=vminterface_table.page %}
+    {% endif %}
     {% if vlan_table %}
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -159,4 +191,20 @@
         </div>
     {% include 'inc/paginator.html' with paginator=controller_table.paginator page=controller_table.page %}
     {% endif %}
+    {% if module_table %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Modules</strong>
+            </div>
+            {% include 'inc/table.html' with table=module_table %}
+            {% if perms.dcim.add_module %}
+                <div class="panel-footer text-right noprint">
+                    <a href="{% url 'dcim:module_add' %}?role={{ object.pk }}" class="btn btn-xs btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Module
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+    {% include 'inc/paginator.html' with paginator=module_table.paginator page=module_table.page %}
+    {% endif %}
  {% endblock content_full_width_page %}

nautobot/extras/templates/extras/staticgroupassociation_retrieve.html

@@ -0,0 +1,20 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Static Group Association</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Dynamic Group</td>
+                <td>{{ object.dynamic_group|hyperlinked_object }}</td>
+            </tr>
+            <tr>
+                <td>Associated Object</td>
+                <td>{{ object.associated_object|hyperlinked_object }}</td>
+            </tr>
+        </table>
+    </div>
+{% endblock content_left_page %}

nautobot/extras/tests/integration/test_customfields.py

@@ -320,6 +320,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.browser.links.find_by_partial_text("Extensibility").click()
         self.browser.links.find_by_partial_text("Custom Fields").click()
         self.browser.links.find_by_partial_text("Device Selection Field").click()
+        self.browser.find_by_id("actions-dropdown").click()
         self.browser.links.find_by_partial_text("Delete").click()
         self.browser.find_by_xpath(".//button[contains(text(), 'Confirm')]").click()