diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-04-04 10:40:14 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-04-04 10:40:14 -0400 |
| commit | 3a23476dbef0bb90ce5e8bc4c7ab8929bc04bb1b (patch) | |
| tree | 8cfb016c545a0b7583fcb7e7acc5a11fc11c20a2 /modules/middleware | |
| parent | 48d3a1fef12242c6f5c1848ca58e02d946a709da (diff) | |
| parent | 75db79b4b6bcb8f61dd957c9bd21b32d4746f866 (diff) | |
Merge pull request #61 from gogits/dev
Dev
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 |