mirror of
https://github.com/kataras/iris.git
synced 2025-03-15 04:06:25 +01:00
Apply new template loader
Former-commit-id: f28eab261ea1ac93774e04240c7e6da663e0da7c
This commit is contained in:
parent
8b0c381808
commit
9777490822
|
@ -230,12 +230,8 @@ func (s *DjangoEngine) loadAssets() error {
|
||||||
virtualDirectory, virtualExtension := s.directory, s.extension
|
virtualDirectory, virtualExtension := s.directory, s.extension
|
||||||
assetFn, namesFn := s.assetFn, s.namesFn
|
assetFn, namesFn := s.assetFn, s.namesFn
|
||||||
|
|
||||||
var templateErr error
|
// Make a file set with a template loader based on asset function
|
||||||
/*fsLoader, err := pongo2.NewLocalFileSystemLoader(virtualDirectory)
|
set := pongo2.NewSet("", &tDjangoAssetLoader{baseDir: s.directory, assetGet: s.assetFn})
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}*/
|
|
||||||
set := pongo2.NewSet("", pongo2.DefaultLoader)
|
|
||||||
set.Globals = getPongoContext(s.globals)
|
set.Globals = getPongoContext(s.globals)
|
||||||
|
|
||||||
// set the filters
|
// set the filters
|
||||||
|
@ -256,6 +252,8 @@ func (s *DjangoEngine) loadAssets() error {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
defer s.mu.Unlock()
|
defer s.mu.Unlock()
|
||||||
|
|
||||||
|
var templateErr error
|
||||||
|
|
||||||
names := namesFn()
|
names := namesFn()
|
||||||
for _, path := range names {
|
for _, path := range names {
|
||||||
if !strings.HasPrefix(path, virtualDirectory) {
|
if !strings.HasPrefix(path, virtualDirectory) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user