lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-25 21:31:30 +00:00
Code Issues Releases Activity

Merge pull request #2067 from Maxgis/issue_accept_encoding

Browse Source 
reflection
This commit is contained in:
astaxie 2016-07-29 09:59:59 +08:00 committed by GitHub
commit e4fe54f6cd
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
template.go
View File

@ -50,22 +50,16 @@ func ExecuteTemplate(wr io.Writer, name string, data interface{}) error {
defer templatesLock.RUnlock() defer templatesLock.RUnlock()
} }
if t, ok := beeTemplates[name]; ok { if t, ok := beeTemplates[name]; ok {
var err error
if t.Lookup(name) != nil { if t.Lookup(name) != nil {
err := t.ExecuteTemplate(wr, name, data) err = t.ExecuteTemplate(wr, name, data)
if err != nil {
logs.Trace("template Execute err:", err)
}
return err
} else { } else {
err := t.Execute(wr, data) err = t.Execute(wr, data)
if err != nil {
if err != nil {
logs.Trace("template Execute err:", err)
}
return err
}
} }
return nil if err != nil {
logs.Trace("template Execute err:", err)
}
return err
} }
panic("can't find templatefile in the path:" + name) panic("can't find templatefile in the path:" + name)
} }