Skip to content

Commit fcdf95e

Browse files
committed
Initialize error_message to empty string avoid string op errors
Update template branching to account for empty content template output
1 parent 0d29e57 commit fcdf95e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

netbox/extras/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ def get_extra_context(self, request, instance):
966966

967967
# Render the config template
968968
rendered_config = None
969-
error_message = None
969+
error_message = ''
970970
if config_template := instance.get_config_template():
971971
try:
972972
rendered_config = config_template.render(context=context_data)

netbox/templates/extras/object_render_config.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ <h2 class="card-header d-flex justify-content-between">
6363
</h2>
6464
<pre class="card-body" id="rendered_config">{{ rendered_config }}</pre>
6565
</div>
66-
{% else %}
66+
{% elif error_message %}
6767
<div class="alert alert-warning">
6868
<h4 class="alert-title mb-1">{% trans "Error rendering template" %}</h4>
6969
{% trans error_message %}
7070
</div>
71+
{% else %}
72+
<div class="alert alert-warning">
73+
<h4 class="alert-title mb-1">{% trans "Template output is empty" %}</h4>
74+
</div>
7175
{% endif %}
7276
{% else %}
7377
<div class="alert alert-info">

0 commit comments

Comments
 (0)