diff options
| -rw-r--r-- | routers/user/user.go | 4 | ||||
| -rw-r--r-- | templates/user/activate.tmpl (renamed from templates/user/active.tmpl) | 0 | ||||
| -rw-r--r-- | web.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/routers/user/user.go b/routers/user/user.go index 56b9dc20..ce4d0cc3 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -341,7 +341,7 @@ func Activate(ctx *middleware.Context) { } else { ctx.Data["ServiceNotEnabled"] = true } - ctx.HTML(200, "user/active") + ctx.HTML(200, "user/activate") return } @@ -363,7 +363,7 @@ func Activate(ctx *middleware.Context) { } ctx.Data["IsActivateFailed"] = true - ctx.HTML(200, "user/active") + ctx.HTML(200, "user/activate") } func ForgotPasswd(ctx *middleware.Context) { diff --git a/templates/user/active.tmpl b/templates/user/activate.tmpl index 9cac069d..9cac069d 100644 --- a/templates/user/active.tmpl +++ b/templates/user/activate.tmpl @@ -100,7 +100,7 @@ func runWeb(*cli.Context) { }, reqSignIn) m.Group("/user", func(r martini.Router) { r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds) - r.Get("/activate", user.Activate) + r.Any("/activate", user.Activate) r.Get("/email2user", user.Email2User) r.Get("/forget_password", user.ForgotPasswd) r.Post("/forget_password", user.ForgotPasswdPost) |