NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 09:28:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Move extras.jinja2.ConfigTemplateLoader to utilities.jinja2.DataFileLoader

Browse Source
This commit is contained in:
Jeremy Stretch 2024-03-21 13:19:12 -04:00
parent b2e03805ab
commit c30d22335a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/models/configs.py
View File

@ -7,12 +7,12 @@ from django.utils.translation import gettext_lazy as _
from jinja2.loaders import BaseLoader from jinja2.loaders import BaseLoader
from jinja2.sandbox import SandboxedEnvironment from jinja2.sandbox import SandboxedEnvironment
from extras.jinja2 import ConfigTemplateLoader
from extras.querysets import ConfigContextQuerySet from extras.querysets import ConfigContextQuerySet
from netbox.config import get_config from netbox.config import get_config
from netbox.registry import registry from netbox.registry import registry
from netbox.models import ChangeLoggedModel from netbox.models import ChangeLoggedModel
from netbox.models.features import CloningMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin from netbox.models.features import CloningMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin
from utilities.jinja2 import DataFileLoader
from utilities.utils import deepmerge from utilities.utils import deepmerge
__all__ = ( __all__ = (
@ -290,7 +290,7 @@ class ConfigTemplate(SyncedDataMixin, CustomLinksMixin, ExportTemplatesMixin, Ta
""" """
# Initialize the template loader & cache the base template code (if applicable) # Initialize the template loader & cache the base template code (if applicable)
if self.data_file: if self.data_file:
loader = ConfigTemplateLoader(data_source=self.data_source) loader = DataFileLoader(data_source=self.data_source)
loader.cache_templates({ loader.cache_templates({
self.data_file.path: self.template_code self.data_file.path: self.template_code
}) })

4
netbox/extras/jinja2.py → netbox/utilities/jinja2.py
View File

@ -3,11 +3,11 @@ from jinja2 import BaseLoader, TemplateNotFound
from jinja2.meta import find_referenced_templates from jinja2.meta import find_referenced_templates
__all__ = ( __all__ = (
'ConfigTemplateLoader', 'DataFileLoader',
) )
class ConfigTemplateLoader(BaseLoader): class DataFileLoader(BaseLoader):
""" """
Custom Jinja2 loader to facilitate populating template content from DataFiles. Custom Jinja2 loader to facilitate populating template content from DataFiles.
""" """