From 977749082249002cf68f1f22a587b4dd5de086e4 Mon Sep 17 00:00:00 2001
From: corebreaker <frederic.meyer.77@gmail.com>
Date: Fri, 21 Jul 2017 17:00:36 +0300
Subject: [PATCH] Apply new template loader

Former-commit-id: f28eab261ea1ac93774e04240c7e6da663e0da7c
---
 view/django.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/view/django.go b/view/django.go
index efe55249..f938ef97 100644
--- a/view/django.go
+++ b/view/django.go
@@ -230,12 +230,8 @@ func (s *DjangoEngine) loadAssets() error {
 	virtualDirectory, virtualExtension := s.directory, s.extension
 	assetFn, namesFn := s.assetFn, s.namesFn
 
-	var templateErr error
-	/*fsLoader, err := pongo2.NewLocalFileSystemLoader(virtualDirectory)
-	if err != nil {
-		return err
-	}*/
-	set := pongo2.NewSet("", pongo2.DefaultLoader)
+	// Make a file set with a template loader based on asset function
+	set := pongo2.NewSet("", &tDjangoAssetLoader{baseDir: s.directory, assetGet: s.assetFn})
 	set.Globals = getPongoContext(s.globals)
 
 	// set the filters
@@ -256,6 +252,8 @@ func (s *DjangoEngine) loadAssets() error {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	var templateErr error
+
 	names := namesFn()
 	for _, path := range names {
 		if !strings.HasPrefix(path, virtualDirectory) {