diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/issue.go | 7 | ||||
| -rw-r--r-- | routers/user/auth.go | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 1843e00144..f0a6d1bd5f 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -291,6 +291,13 @@ func Issues(ctx *context.Context) { return } + perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User) + if err != nil { + ctx.ServerError("GetUserRepoPermission", err) + return + } + ctx.Data["CanWriteIssuesOrPulls"] = perm.CanWriteIssuesOrPulls(isPullList) + ctx.HTML(200, tplIssues) } diff --git a/routers/user/auth.go b/routers/user/auth.go index c86eb35403..fc4c358a9a 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -1185,7 +1185,11 @@ func ResetPasswd(ctx *context.Context) { return } ctx.Data["Code"] = code - ctx.Data["IsResetForm"] = true + + if u := models.VerifyUserActiveCode(code); u != nil { + ctx.Data["IsResetForm"] = true + } + ctx.HTML(200, tplResetPassword) } |