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

Merge pull request #2496 from eyalpost/develop

Browse Source 
Don't panic during AddViewPath if adding the same path twice
This commit is contained in:
astaxie 2017-03-14 12:54:48 +08:00 committed by GitHub
commit 206f736819
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
template.go
View File

@ -72,7 +72,7 @@ func ExecuteViewPathTemplate(wr io.Writer, name string, viewPath string, data in
} }
panic("can't find templatefile in the path:" + viewPath + "/" + name) panic("can't find templatefile in the path:" + viewPath + "/" + name)
} }
panic("Uknown view path:" + viewPath) panic("Unknown view path:" + viewPath)
} }
func init() { func init() {
@ -165,6 +165,9 @@ func AddTemplateExt(ext string) {
//will panic if called after beego.Run() //will panic if called after beego.Run()
func AddViewPath(viewPath string) error { func AddViewPath(viewPath string) error {
if beeViewPathTemplateLocked { if beeViewPathTemplateLocked {
if _, exist := beeViewPathTemplates[viewPath]; exist {
return nil //Ignore if viewpath already exists
}
panic("Can not add new view paths after beego.Run()") panic("Can not add new view paths after beego.Run()")
} }
beeViewPathTemplates[viewPath] = make(map[string]*template.Template) beeViewPathTemplates[viewPath] = make(map[string]*template.Template)