Просмотр исходного кода

Fixes #12115: Fix rendering config templates from a data file

jeremystretch 2 лет назад
Родитель
Сommit
6a85c5b3ce
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 0
      docs/release-notes/version-3.5.md
  2. 4 1
      netbox/extras/models/configs.py

+ 1 - 0
docs/release-notes/version-3.5.md

@@ -75,6 +75,7 @@ Two new webhook trigger events have been introduced: `job_start` and `job_end`.
 * [#12108](https://github.com/netbox-community/netbox/issues/12108) - Limit the draggable area of widgets to their headers
 * [#12109](https://github.com/netbox-community/netbox/issues/12109) - Fix migration error when replicating more than 100 job results
 * [#12112](https://github.com/netbox-community/netbox/issues/12112) - Do not link data source URL for local paths
+* [#12115](https://github.com/netbox-community/netbox/issues/12115) - Fix rendering config templates from a data file
 
 ### Other Changes
 

+ 4 - 1
netbox/extras/models/configs.py

@@ -245,7 +245,10 @@ class ConfigTemplate(SyncedDataMixin, ExportTemplatesMixin, TagsMixin, ChangeLog
 
         # Initialize the Jinja2 environment and instantiate the Template
         environment = self._get_environment()
-        template = environment.from_string(self.template_code)
+        if self.data_file:
+            template = environment.get_template(self.data_file.path)
+        else:
+            template = environment.from_string(self.template_code)
         output = template.render(**context)
 
         # Replace CRLF-style line terminators