diff options
| author | Meaglith Ma <genedna@gmail.com> | 2014-04-06 17:28:33 +0800 |
|---|---|---|
| committer | Meaglith Ma <genedna@gmail.com> | 2014-04-06 17:28:33 +0800 |
| commit | 2e8d5c2eb36b63468dc78561566975c72eeaaefa (patch) | |
| tree | 92659a09ec784005c8d9a0540e5197a75b0a3ea9 /modules/middleware | |
| parent | a044c24c3db4b18b20406045b40e55ce15f941a0 (diff) | |
| parent | ef6b9784962d3152d3ec46833303bad72915af57 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/context.go | 4 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/middleware/context.go b/modules/middleware/context.go index d2b268cd..8129b13b 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -90,7 +90,9 @@ func (ctx *Context) HTML(status int, name string, htmlOpt ...HTMLOptions) { func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) { ctx.Data["HasError"] = true ctx.Data["ErrorMsg"] = msg - auth.AssignForm(form, ctx.Data) + if form != nil { + auth.AssignForm(form, ctx.Data) + } ctx.HTML(200, tpl) } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index f446d6a8..2139742c 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -79,6 +79,7 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler { ctx.Handle(404, "RepoAssignment", err) return } + repo.NumOpenIssues = repo.NumIssues - repo.NumClosedIssues ctx.Repo.Repository = repo ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare |