From 199fdd03360e3c9d1d2fb93fe993e01d115e8312 Mon Sep 17 00:00:00 2001 From: slene Date: Wed, 19 Mar 2014 22:21:03 +0800 Subject: fork render --- routers/repo/repo.go | 10 +++++----- routers/repo/single.go | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'routers/repo') diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 61bf47c1..947643a1 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -17,7 +17,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) { if ctx.Req.Method == "GET" { ctx.Data["LanguageIgns"] = models.LanguageIgns ctx.Data["Licenses"] = models.Licenses - ctx.Render.HTML(200, "repo/create", ctx.Data) + ctx.HTML(200, "repo/create", ctx.Data) return } @@ -25,7 +25,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) { form.Language, form.License, form.Visibility == "private", form.InitReadme == "on") if err == nil { log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName) - ctx.Render.Redirect("/"+ctx.User.Name+"/"+form.RepoName, 302) + ctx.Redirect("/"+ctx.User.Name+"/"+form.RepoName, 302) return } else if err == models.ErrRepoAlreadyExist { ctx.RenderWithErr("Repository name has already been used", "repo/create", &form) @@ -36,7 +36,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) { func SettingPost(ctx *middleware.Context) { if !ctx.Repo.IsOwner { - ctx.Render.Error(404) + ctx.Error(404) return } @@ -44,7 +44,7 @@ func SettingPost(ctx *middleware.Context) { case "delete": if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") { ctx.Data["ErrorMsg"] = "Please make sure you entered repository name is correct." - ctx.Render.HTML(200, "repo/setting", ctx.Data) + ctx.HTML(200, "repo/setting", ctx.Data) return } @@ -55,5 +55,5 @@ func SettingPost(ctx *middleware.Context) { } log.Trace("%s Repository deleted: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName) - ctx.Render.Redirect("/", 302) + ctx.Redirect("/", 302) } diff --git a/routers/repo/single.go b/routers/repo/single.go index d64248d9..171b0952 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -27,7 +27,7 @@ func Branches(ctx *middleware.Context, params martini.Params) { ctx.Handle(200, "repo.Branches", err) return } else if len(brs) == 0 { - ctx.Render.Error(404) + ctx.Error(404) return } @@ -38,7 +38,7 @@ func Branches(ctx *middleware.Context, params martini.Params) { ctx.Data["Branches"] = brs ctx.Data["IsRepoToolbarBranches"] = true - ctx.Render.HTML(200, "repo/branches", ctx.Data) + ctx.HTML(200, "repo/branches", ctx.Data) } func Single(ctx *middleware.Context, params martini.Params) { @@ -57,11 +57,11 @@ func Single(ctx *middleware.Context, params martini.Params) { brs, err := models.GetBranches(params["username"], params["reponame"]) if err != nil { log.Error("repo.Single(GetBranches): %v", err) - ctx.Render.Error(404) + ctx.Error(404) return } else if len(brs) == 0 { ctx.Data["IsBareRepo"] = true - ctx.Render.HTML(200, "repo/single", ctx.Data) + ctx.HTML(200, "repo/single", ctx.Data) return } @@ -72,7 +72,7 @@ func Single(ctx *middleware.Context, params martini.Params) { params["branchname"], params["commitid"], treename) if err != nil { log.Error("repo.Single(GetReposFiles): %v", err) - ctx.Render.Error(404) + ctx.Error(404) return } ctx.Data["Username"] = params["username"] @@ -94,7 +94,7 @@ func Single(ctx *middleware.Context, params martini.Params) { params["branchname"], params["commitid"]) if err != nil { log.Error("repo.Single(GetCommit): %v", err) - ctx.Render.Error(404) + ctx.Error(404) return } ctx.Data["LastCommit"] = commit @@ -130,12 +130,12 @@ func Single(ctx *middleware.Context, params martini.Params) { ctx.Data["Treenames"] = treenames ctx.Data["IsRepoToolbarSource"] = true ctx.Data["Files"] = files - ctx.Render.HTML(200, "repo/single", ctx.Data) + ctx.HTML(200, "repo/single", ctx.Data) } func Setting(ctx *middleware.Context, params martini.Params) { if !ctx.Repo.IsOwner { - ctx.Render.Error(404) + ctx.Error(404) return } @@ -143,11 +143,11 @@ func Setting(ctx *middleware.Context, params martini.Params) { brs, err := models.GetBranches(params["username"], params["reponame"]) if err != nil { log.Error("repo.Setting(GetBranches): %v", err) - ctx.Render.Error(404) + ctx.Error(404) return } else if len(brs) == 0 { ctx.Data["IsBareRepo"] = true - ctx.Render.HTML(200, "repo/setting", ctx.Data) + ctx.HTML(200, "repo/setting", ctx.Data) return } @@ -158,7 +158,7 @@ func Setting(ctx *middleware.Context, params martini.Params) { ctx.Data["Title"] = title + " - settings" ctx.Data["IsRepoToolbarSetting"] = true - ctx.Render.HTML(200, "repo/setting", ctx.Data) + ctx.HTML(200, "repo/setting", ctx.Data) } func Commits(ctx *middleware.Context, params martini.Params) { @@ -167,7 +167,7 @@ func Commits(ctx *middleware.Context, params martini.Params) { ctx.Handle(200, "repo.Commits", err) return } else if len(brs) == 0 { - ctx.Render.Error(404) + ctx.Error(404) return } @@ -175,19 +175,19 @@ func Commits(ctx *middleware.Context, params martini.Params) { commits, err := models.GetCommits(params["username"], params["reponame"], params["branchname"]) if err != nil { - ctx.Render.Error(404) + ctx.Error(404) return } ctx.Data["Commits"] = commits - ctx.Render.HTML(200, "repo/commits", ctx.Data) + ctx.HTML(200, "repo/commits", ctx.Data) } func Issues(ctx *middleware.Context) { ctx.Data["IsRepoToolbarIssues"] = true - ctx.Render.HTML(200, "repo/issues", ctx.Data) + ctx.HTML(200, "repo/issues", ctx.Data) } func Pulls(ctx *middleware.Context) { ctx.Data["IsRepoToolbarPulls"] = true - ctx.Render.HTML(200, "repo/pulls", ctx.Data) + ctx.HTML(200, "repo/pulls", ctx.Data) } -- cgit v1.2.3