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

fix router & tpl tolower

Browse Source
This commit is contained in:
astaxie 2013-07-30 22:17:16 +08:00
parent bce35c708a
commit 8674b81b3a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller.go
View File

@ -156,7 +156,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
//if the controller has set layout, then first get the tplname's content set the content to the layout //if the controller has set layout, then first get the tplname's content set the content to the layout
if c.Layout != "" { if c.Layout != "" {
if c.TplNames == "" { if c.TplNames == "" {
c.TplNames = c.ChildName + "/" + c.Ctx.Request.Method + "." + c.TplExt c.TplNames = c.ChildName + "/" + strings.ToLower(c.Ctx.Request.Method) + "." + c.TplExt
} }
if RunMode == "dev" { if RunMode == "dev" {
BuildTemplate(ViewsPath) BuildTemplate(ViewsPath)

17
router.go
View File

@ -373,14 +373,15 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
for _, route := range p.fixrouters { for _, route := range p.fixrouters {
n := len(requestPath) n := len(requestPath)
//route like "/" //route like "/"
if n == 1 { //if n == 1 {
if requestPath == route.pattern { // else {
runrouter = route // continue
findrouter = true // }
break //}
} else { if requestPath == route.pattern {
continue runrouter = route
} findrouter = true
break
} }
if (requestPath[n-1] != '/' && route.pattern == requestPath) || if (requestPath[n-1] != '/' && route.pattern == requestPath) ||