فهرست منبع

Merge pull request #19527 from Omripresent/fix-19496

Fixes #19496: Page error on config render with empty output
bctiemann 8 ماه پیش
والد
کامیت
2804359cdd
2فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 1 1
      netbox/extras/views.py
  2. 5 1
      netbox/templates/extras/object_render_config.html

+ 1 - 1
netbox/extras/views.py

@@ -966,7 +966,7 @@ class ObjectRenderConfigView(generic.ObjectView):
 
 
         # Render the config template
         # Render the config template
         rendered_config = None
         rendered_config = None
-        error_message = None
+        error_message = ''
         if config_template := instance.get_config_template():
         if config_template := instance.get_config_template():
             try:
             try:
                 rendered_config = config_template.render(context=context_data)
                 rendered_config = config_template.render(context=context_data)

+ 5 - 1
netbox/templates/extras/object_render_config.html

@@ -63,11 +63,15 @@
             </h2>
             </h2>
             <pre class="card-body" id="rendered_config">{{ rendered_config }}</pre>
             <pre class="card-body" id="rendered_config">{{ rendered_config }}</pre>
           </div>
           </div>
-        {% else %}
+        {% elif error_message %}
           <div class="alert alert-warning">
           <div class="alert alert-warning">
             <h4 class="alert-title mb-1">{% trans "Error rendering template" %}</h4>
             <h4 class="alert-title mb-1">{% trans "Error rendering template" %}</h4>
             {% trans error_message %}
             {% trans error_message %}
           </div>
           </div>
+        {% else %}
+          <div class="alert alert-warning">
+            <h4 class="alert-title mb-1">{% trans "Template output is empty" %}</h4>
+          </div>
         {% endif %}
         {% endif %}
       {% else %}
       {% else %}
         <div class="alert alert-info">
         <div class="alert alert-info">