lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity

fix #260

This commit is contained in:
astaxie 2013-10-29 23:05:48 +08:00
parent 7131dec3af
commit 5f4fe6d868
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
template.go
View File

@ -154,10 +154,23 @@ func getTplDeep(root, file string, t *template.Template) (*template.Template, []
if !HasTemplateEXt(m[1]) {
continue
}
t, _, err = getTplDeep(root, m[1], t)
if err != nil {
return nil, [][]string{}, err
if e, _ := FileExists(filepath.Join(root, m[1])); e {
t, _, err = getTplDeep(root, m[1], t)
if err != nil {
return nil, [][]string{}, err
}
} else {
relativefile := filepath.Join(filepath.Dir(file), m[1])
if e, _ := FileExists(relativefile); e {
t, _, err = getTplDeep(root, m[1], t)
if err != nil {
return nil, [][]string{}, err
}
} else {
panic("can't find template file" + m[1])
}
}
}
}
return t, allsub, nil