Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #17490: Config Template unable to dynamically include templates #18106

Merged
merged 4 commits into from
Dec 5, 2024
Merged

Fixes #17490: Config Template unable to dynamically include templates #18106

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f45300
Fixes #17490: Config Template unable to dynamically include templates
robduffy2010 Nov 26, 2024
9930fef
Cast the generator returned by find_referenced_templates() to an iter…
robduffy2010 Dec 2, 2024
5173a49
Apply the path__in filter to avoid duplicating code
robduffy2010 Dec 2, 2024
20c0235
Remove extra if None not in referenced_templates
robduffy2010 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions netbox/utilities/jinja2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@ def get_source(self, environment, template):
raise TemplateNotFound(template)

# Find and pre-fetch referenced templates
if referenced_templates := find_referenced_templates(environment.parse(template_source)):
if referenced_templates := tuple(find_referenced_templates(environment.parse(template_source))):
related_files = DataFile.objects.filter(source=self.data_source)
# None indicates the use of dynamic resolution. If dependent files are statically
# defined, we can filter by path for optimization.
if None not in referenced_templates:
related_files = related_files.filter(path__in=referenced_templates)
self.cache_templates({
df.path: df.data_as_string for df in
DataFile.objects.filter(source=self.data_source, path__in=referenced_templates)
df.path: df.data_as_string for df in related_files
})

return template_source, template, lambda: True
Expand Down
Loading