nautobot 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

nautobot/extras/templates/extras/customfield.html

@@ -10,27 +10,27 @@
                 <table class="table table-hover panel-body attr-table">
                     <tr>
                         <td>Label</td>
-                        <td><span>{{ object.label }}</span></td>
+                        <td>{{ object.label }}</td>
                     </tr>
                     <tr>
                         <td>Key</td>
-                        <td><span>{{ object.key }}</span></td>
+                        <td>{{ object.key }}</td>
                     </tr>
                     <tr>
                         <td>Type</td>
-                        <td><span>{{ object.type | capfirst }}</span></td>
+                        <td>{{ object.type | capfirst }}</td>
                     </tr>
                     <tr>
                         <td>Weight</td>
-                        <td><span>{{ object.weight }}</span></td>
+                        <td>{{ object.weight }}</td>
                     </tr>
                     <tr>
                         <td>Grouping</td>
-                        <td><span>{{ object.grouping | placeholder }}</span></td>
+                        <td>{{ object.grouping | placeholder }}</td>
                     </tr>
                     <tr>
                         <td>Description</td>
-                        <td><span>{{ object.description | render_markdown | placeholder }}</span></td>
+                        <td>{{ object.description | render_markdown | placeholder }}</td>
                     </tr>
                     <tr>
                         <td>Required</td>
@@ -38,15 +38,23 @@
                     </tr>
                     <tr>
                         <td>Default</td>
-                        <td><span>{{ object.default }}</span></td>
+                        <td>
+                            {% if object.type == "markdown" %}
+                                {{ object.default | render_markdown | placeholder }}
+                            {% elif object.type == "json" and object.default is not None %}
+                                <pre>{{ object.default | render_json }}</pre>
+                            {% else %}
+                                {{ object.default | placeholder }}
+                            {% endif %}
+                        </td>
                     </tr>
                     <tr>
                         <td>Filter Logic</td>
-                        <td><span>{{ object.filter_logic | capfirst }}</span></td>
+                        <td>{{ object.filter_logic | capfirst }}</td>
                     </tr>
                     <tr>
                         <td>Move to Advanced Tab</td>
-                        <td><span>{{ object.advanced_ui | render_boolean }}</span></td>
+                        <td>{{ object.advanced_ui | render_boolean }}</td>
                     </tr>
                 </table>
             </div>
@@ -99,12 +107,12 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Minimum Value</td>
-                        <td><span>{{ object.validation_minimum | placeholder }}</span></td>
+                        <td>Minimum Value/Length</td>
+                        <td>{{ object.validation_minimum | placeholder }}</td>
                     </tr>
                     <tr>
-                        <td>Maximum Value Type</td>
-                        <td><span>{{ object.validation_maximum | placeholder }}</span></td>
+                        <td>Maximum Value/Length</td>
+                        <td>{{ object.validation_maximum | placeholder }}</td>
                     </tr>
                     <tr>
                         <td>Validation Regex</td>
@@ -112,7 +120,7 @@
                             {% if object.validation_regex %}
                                 <code>{{ object.validation_regex | placeholder }}</code>
                             {% else %}
-                                <span>{{ object.validation_regex | placeholder }}</span>
+                                {{ object.validation_regex | placeholder }}
                             {% endif %}
                         </td>
                     </tr>

nautobot/extras/templatetags/job_buttons.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 
 from django import template
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from django.utils.html import format_html
@@ -27,6 +28,7 @@ HIDDEN_INPUTS = """
 <input type="hidden" name="object_pk" value="{object_pk}">
 <input type="hidden" name="object_model_name" value="{object_model_name}">
 <input type="hidden" name="_schedule_type" value="immediately">
+<input type="hidden" name="_task_queue" value="{task_queue}">
 <input type="hidden" name="_return_url" value="{redirect_path}">
 """
 
@@ -105,12 +107,17 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
 
     # Disable buttons if the user doesn't have permission to run the underlying Job.
     has_run_perm = Job.objects.check_perms(context["user"], instance=job_button.job, action="run")
+    try:
+        _task_queue = job_button.job.task_queues[0]
+    except IndexError:
+        _task_queue = settings.CELERY_TASK_DEFAULT_QUEUE
     hidden_inputs = format_html(
         HIDDEN_INPUTS,
         csrf_token=context["csrf_token"],
         object_pk=obj.pk,
         object_model_name=f"{content_type.app_label}.{content_type.model}",
         redirect_path=context["request"].path,
+        task_queue=_task_queue,
     )
     template_args = {
         "button_id": job_button.pk,

nautobot/extras/templatetags/plugins.py

@@ -56,10 +56,14 @@ def _get_registered_content(obj, method, template_context, return_html=True):
 
 
 @register.simple_tag(takes_context=True)
-def plugin_buttons(context, obj):
+def plugin_buttons(context, obj, view="detail"):
     """
     Render all buttons registered by plugins
     """
+    if view == "list":
+        # The object_list.html template passes content_type.model_class as obj
+        # This is a bit of a hack however, _get_registered_content() only really needs the model in its own logic
+        return _get_registered_content(obj, "list_buttons", context)
     return _get_registered_content(obj, "buttons", context)