Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-17 09:57:01 +00:00
Code Releases Activity

🎄 Merry Christmas everyone

Browse Source 
minor fixes
This commit is contained in:
Gerasimos (Makis) Maropoulos
2021-12-26 00:01:01 +02:00
parent e213dba0d3
commit 62a1829cb9
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
view/amber.go
View File

@@ -217,7 +217,7 @@ func (s *AmberEngine) executeTemplateBuf(name string, binding interface{}) (stri
tmpl := s.fromCache(name)
if tmpl == nil {
s.bufPool.Put(buf)
return "", ErrNotExist{name, false, binding}
return "", ErrNotExist{Name: name, IsLayout: false, Data: binding}
}
err := tmpl.ExecuteTemplate(buf, name, binding)
@@ -253,5 +253,5 @@ func (s *AmberEngine) ExecuteWriter(w io.Writer, filename string, layout string,
return tmpl.Execute(w, bindingData)
}
return ErrNotExist{filename, false, bindingData}
return ErrNotExist{Name: filename, IsLayout: false, Data: bindingData}
}

2
view/django.go
View File

@@ -307,5 +307,5 @@ func (s *DjangoEngine) ExecuteWriter(w io.Writer, filename string, _ string, bin
return tmpl.ExecuteWriter(getPongoContext(bindingData), w)
}
return ErrNotExist{filename, false, bindingData}
return ErrNotExist{Name: filename, IsLayout: false, Data: bindingData}
}

8
view/handlebars.go
View File

@@ -212,7 +212,7 @@ func (s *HandlebarsEngine) ExecuteWriter(w io.Writer, filename string, layout st
if m, is := binding.(map[string]interface{}); is { // handlebars accepts maps,
context = m
} else {
return fmt.Errorf("Please provide a map[string]interface{} type as the binding instead of the %#v", binding)
return fmt.Errorf("please provide a map[string]interface{} type as the binding instead of the %#v", binding)
}
contents, err := s.executeTemplateBuf(filename, binding)
@@ -235,5 +235,9 @@ func (s *HandlebarsEngine) ExecuteWriter(w io.Writer, filename string, layout st
return err
}
return ErrNotExist{fmt.Sprintf("%s (file: %s)", renderFilename, filename), false, bindingData}
return ErrNotExist{
Name: fmt.Sprintf("%s (file: %s)", renderFilename, filename),
IsLayout: false,
Data: bindingData,
}
}

4
view/html.go
View File

@@ -421,14 +421,14 @@ func (s *HTMLEngine) ExecuteWriter(w io.Writer, name string, layout string, bind
t := s.Templates.Lookup(name)
if t == nil {
return ErrNotExist{name, false, bindingData}
return ErrNotExist{Name: name, IsLayout: false, Data: bindingData}
}
s.runtimeFuncsFor(t, name, bindingData)
if layout = getLayout(layout, s.layout); layout != "" {
lt := s.Templates.Lookup(layout)
if lt == nil {
return ErrNotExist{layout, true, bindingData}
return ErrNotExist{Name: layout, IsLayout: true, Data: bindingData}
}
s.layoutFuncsFor(lt, name, bindingData)

2
view/view.go
View File

@@ -79,7 +79,7 @@ func (v *View) AddFunc(funcName string, funcBody interface{}) {
// Load compiles all the registered engines.
func (v *View) Load() error {
if !v.Registered() {
return fmt.Errorf("No engine is registered")
return fmt.Errorf("no engine was registered")
}
return v.Engine.Load()
}