Mergiate le due versioni

utils/template_renderer.go

@@ -2,12 +2,14 @@ package utils
 
 import (
 	"io"
-	"os"
 	"text/template"
+
+	"github.com/phc-dm/server-poisson/config"
 )
 
 // TemplateRenderer holds cached templates for rendering
 type TemplateRenderer struct {
+	baseFile     string
 	baseTemplate *template.Template
 	templateMap  map[string]*template.Template
 }
@@ -15,6 +17,7 @@ type TemplateRenderer struct {
 // NewTemplateRenderer constructs a template renderer with a base file
 func NewTemplateRenderer(baseFile string) *TemplateRenderer {
 	return &TemplateRenderer{
+		baseFile:     baseFile,
 		baseTemplate: template.Must(template.ParseFiles("./views/" + baseFile)),
 		templateMap:  make(map[string]*template.Template),
 	}
@@ -24,8 +27,15 @@ func NewTemplateRenderer(baseFile string) *TemplateRenderer {
 func (t *TemplateRenderer) Render(w io.Writer, name string, data interface{}) error {
 	tmpl := t.templateMap[name]
 
-	if os.Getenv("MODE") == "development" || tmpl == nil {
+	if config.Mode == "development" || tmpl == nil {
 		tmpl = template.Must(t.baseTemplate.Clone())
+
+		if config.Mode == "development" {
+			tmpl = template.Must(template.ParseFiles("./views/" + t.baseFile))
+		} else {
+			tmpl = template.Must(t.baseTemplate.Clone())
+		}
+
 		tmpl.ParseFiles("./views/" + name)
 		t.templateMap[name] = tmpl
 	}