aboutsummaryrefslogtreecommitdiff
path: root/routers/repo
diff options
context:
space:
mode:
Diffstat (limited to 'routers/repo')
-rw-r--r--routers/repo/branch.go11
-rw-r--r--routers/repo/commit.go92
-rw-r--r--routers/repo/http.go8
-rw-r--r--routers/repo/issue.go34
-rw-r--r--routers/repo/pull.go7
-rw-r--r--routers/repo/release.go19
-rw-r--r--routers/repo/repo.go106
-rw-r--r--routers/repo/setting.go71
8 files changed, 235 insertions, 113 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 2e2ae692..9bad7289 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -7,22 +7,27 @@ package repo
import (
"github.com/go-martini/martini"
+ "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
+const (
+ BRANCH base.TplName = "repo/branch"
+)
+
func Branches(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Branches"
ctx.Data["IsRepoToolbarBranches"] = true
brs, err := ctx.Repo.GitRepo.GetBranches()
if err != nil {
- ctx.Handle(500, "repo.Branches", err)
+ ctx.Handle(500, "repo.Branches(GetBranches)", err)
return
} else if len(brs) == 0 {
- ctx.Handle(404, "repo.Branches", nil)
+ ctx.Handle(404, "repo.Branches(GetBranches)", nil)
return
}
ctx.Data["Branches"] = brs
- ctx.HTML(200, "repo/branches")
+ ctx.HTML(200, BRANCH)
}
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 09dcaf5e..aa5c22e4 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -14,6 +14,11 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+const (
+ COMMITS base.TplName = "repo/commits"
+ DIFF base.TplName = "repo/diff"
+)
+
func Commits(ctx *middleware.Context, params martini.Params) {
ctx.Data["IsRepoToolbarCommits"] = true
@@ -22,10 +27,10 @@ func Commits(ctx *middleware.Context, params martini.Params) {
brs, err := ctx.Repo.GitRepo.GetBranches()
if err != nil {
- ctx.Handle(500, "repo.Commits", err)
+ ctx.Handle(500, "repo.Commits(GetBranches)", err)
return
} else if len(brs) == 0 {
- ctx.Handle(404, "repo.Commits", nil)
+ ctx.Handle(404, "repo.Commits(GetBranches)", nil)
return
}
@@ -61,7 +66,43 @@ func Commits(ctx *middleware.Context, params martini.Params) {
ctx.Data["CommitCount"] = commitsCount
ctx.Data["LastPageNum"] = lastPage
ctx.Data["NextPageNum"] = nextPage
- ctx.HTML(200, "repo/commits")
+ ctx.HTML(200, COMMITS)
+}
+
+func SearchCommits(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["IsSearchPage"] = true
+ ctx.Data["IsRepoToolbarCommits"] = true
+
+ keyword := ctx.Query("q")
+ if len(keyword) == 0 {
+ ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
+ return
+ }
+
+ userName := params["username"]
+ repoName := params["reponame"]
+
+ brs, err := ctx.Repo.GitRepo.GetBranches()
+ if err != nil {
+ ctx.Handle(500, "repo.SearchCommits(GetBranches)", err)
+ return
+ } else if len(brs) == 0 {
+ ctx.Handle(404, "repo.SearchCommits(GetBranches)", nil)
+ return
+ }
+
+ commits, err := ctx.Repo.Commit.SearchCommits(keyword)
+ if err != nil {
+ ctx.Handle(500, "repo.SearchCommits(SearchCommits)", err)
+ return
+ }
+
+ ctx.Data["Keyword"] = keyword
+ ctx.Data["Username"] = userName
+ ctx.Data["Reponame"] = repoName
+ ctx.Data["CommitCount"] = commits.Len()
+ ctx.Data["Commits"] = commits
+ ctx.HTML(200, COMMITS)
}
func Diff(ctx *middleware.Context, params martini.Params) {
@@ -75,7 +116,7 @@ func Diff(ctx *middleware.Context, params martini.Params) {
diff, err := models.GetDiff(models.RepoPath(userName, repoName), commitId)
if err != nil {
- ctx.Handle(404, "repo.Diff", err)
+ ctx.Handle(404, "repo.Diff(GetDiff)", err)
return
}
@@ -119,43 +160,7 @@ func Diff(ctx *middleware.Context, params martini.Params) {
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
ctx.Data["SourcePath"] = "/" + path.Join(userName, repoName, "src", commitId)
ctx.Data["RawPath"] = "/" + path.Join(userName, repoName, "raw", commitId)
- ctx.HTML(200, "repo/diff")
-}
-
-func SearchCommits(ctx *middleware.Context, params martini.Params) {
- ctx.Data["IsSearchPage"] = true
- ctx.Data["IsRepoToolbarCommits"] = true
-
- keyword := ctx.Query("q")
- if len(keyword) == 0 {
- ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
- return
- }
-
- userName := params["username"]
- repoName := params["reponame"]
-
- brs, err := ctx.Repo.GitRepo.GetBranches()
- if err != nil {
- ctx.Handle(500, "repo.SearchCommits(GetBranches)", err)
- return
- } else if len(brs) == 0 {
- ctx.Handle(404, "repo.SearchCommits(GetBranches)", nil)
- return
- }
-
- commits, err := ctx.Repo.Commit.SearchCommits(keyword)
- if err != nil {
- ctx.Handle(500, "repo.SearchCommits(SearchCommits)", err)
- return
- }
-
- ctx.Data["Keyword"] = keyword
- ctx.Data["Username"] = userName
- ctx.Data["Reponame"] = repoName
- ctx.Data["CommitCount"] = commits.Len()
- ctx.Data["Commits"] = commits
- ctx.HTML(200, "repo/commits")
+ ctx.HTML(200, DIFF)
}
func FileHistory(ctx *middleware.Context, params martini.Params) {
@@ -184,8 +189,7 @@ func FileHistory(ctx *middleware.Context, params martini.Params) {
if err != nil {
ctx.Handle(500, "repo.FileHistory(GetCommitsCount)", err)
return
- }
- if commitsCount == 0 {
+ } else if commitsCount == 0 {
ctx.Handle(404, "repo.FileHistory", nil)
return
}
@@ -217,5 +221,5 @@ func FileHistory(ctx *middleware.Context, params martini.Params) {
ctx.Data["CommitCount"] = commitsCount
ctx.Data["LastPageNum"] = lastPage
ctx.Data["NextPageNum"] = nextPage
- ctx.HTML(200, "repo/commits")
+ ctx.HTML(200, COMMITS)
}
diff --git a/routers/repo/http.go b/routers/repo/http.go
index 2f28742b..d22c0f87 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -107,9 +107,9 @@ func Http(ctx *middleware.Context, params martini.Params) {
}
if !isPublicPull {
- var tp = models.AU_WRITABLE
+ var tp = models.WRITABLE
if isPull {
- tp = models.AU_READABLE
+ tp = models.READABLE
}
has, err := models.HasAccess(authUsername, username+"/"+reponame, tp)
@@ -117,8 +117,8 @@ func Http(ctx *middleware.Context, params martini.Params) {
ctx.Handle(401, "no basic auth and digit auth", nil)
return
} else if !has {
- if tp == models.AU_READABLE {
- has, err = models.HasAccess(authUsername, username+"/"+reponame, models.AU_WRITABLE)
+ if tp == models.READABLE {
+ has, err = models.HasAccess(authUsername, username+"/"+reponame, models.WRITABLE)
if err != nil || !has {
ctx.Handle(401, "no basic auth and digit auth", nil)
return
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 11c573f5..cf454bc8 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -22,6 +22,16 @@ import (
"github.com/gogits/gogs/modules/setting"
)
+const (
+ ISSUES base.TplName = "repo/issue/list"
+ ISSUE_CREATE base.TplName = "repo/issue/create"
+ ISSUE_VIEW base.TplName = "repo/issue/view"
+
+ MILESTONE base.TplName = "repo/issue/milestone"
+ MILESTONE_NEW base.TplName = "repo/issue/milestone_new"
+ MILESTONE_EDIT base.TplName = "repo/issue/milestone_edit"
+)
+
func Issues(ctx *middleware.Context) {
ctx.Data["Title"] = "Issues"
ctx.Data["IsRepoToolbarIssues"] = true
@@ -134,7 +144,7 @@ func Issues(ctx *middleware.Context) {
} else {
ctx.Data["ShowCount"] = issueStats.OpenCount
}
- ctx.HTML(200, "issue/list")
+ ctx.HTML(200, ISSUES)
}
func CreateIssue(ctx *middleware.Context, params martini.Params) {
@@ -161,7 +171,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params) {
return
}
ctx.Data["Collaborators"] = us
- ctx.HTML(200, "issue/create")
+ ctx.HTML(200, ISSUE_CREATE)
}
func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
@@ -190,7 +200,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
ctx.Data["Collaborators"] = us
if ctx.HasError() {
- ctx.HTML(200, "issue/create")
+ ctx.HTML(200, ISSUE_CREATE)
return
}
@@ -392,7 +402,7 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) {
ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner || (ctx.IsSigned && issue.PosterId == ctx.User.Id)
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = false
- ctx.HTML(200, "issue/view")
+ ctx.HTML(200, ISSUE_VIEW)
}
func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
@@ -794,14 +804,14 @@ func Milestones(ctx *middleware.Context) {
} else {
ctx.Data["State"] = "open"
}
- ctx.HTML(200, "issue/milestone")
+ ctx.HTML(200, MILESTONE)
}
func NewMilestone(ctx *middleware.Context) {
ctx.Data["Title"] = "New Milestone"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true
- ctx.HTML(200, "issue/milestone_new")
+ ctx.HTML(200, MILESTONE_NEW)
}
func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
@@ -809,6 +819,11 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true
+ if ctx.HasError() {
+ ctx.HTML(200, MILESTONE_NEW)
+ return
+ }
+
var deadline time.Time
var err error
if len(form.Deadline) == 0 {
@@ -890,7 +905,7 @@ func UpdateMilestone(ctx *middleware.Context, params martini.Params) {
}
ctx.Data["Milestone"] = mile
- ctx.HTML(200, "issue/milestone_edit")
+ ctx.HTML(200, MILESTONE_EDIT)
}
func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form auth.CreateMilestoneForm) {
@@ -914,6 +929,11 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au
return
}
+ if ctx.HasError() {
+ ctx.HTML(200, MILESTONE_EDIT)
+ return
+ }
+
var deadline time.Time
if len(form.Deadline) == 0 {
form.Deadline = "12/31/9999"
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 430c6a81..db208f9f 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -7,10 +7,15 @@ package repo
import (
"github.com/go-martini/martini"
+ "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
+const (
+ PULLS base.TplName = "repo/pulls"
+)
+
func Pulls(ctx *middleware.Context, params martini.Params) {
ctx.Data["IsRepoToolbarPulls"] = true
- ctx.HTML(200, "repo/pulls")
+ ctx.HTML(200, PULLS)
}
diff --git a/routers/repo/release.go b/routers/repo/release.go
index b6149b63..a901436f 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -14,6 +14,12 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+const (
+ RELEASES base.TplName = "repo/release/list"
+ RELEASE_NEW base.TplName = "repo/release/new"
+ RELEASE_EDIT base.TplName = "repo/release/edit"
+)
+
func Releases(ctx *middleware.Context) {
ctx.Data["Title"] = "Releases"
ctx.Data["IsRepoToolbarReleases"] = true
@@ -100,7 +106,7 @@ func Releases(ctx *middleware.Context) {
}
models.SortReleases(tags)
ctx.Data["Releases"] = tags
- ctx.HTML(200, "release/list")
+ ctx.HTML(200, RELEASES)
}
func NewRelease(ctx *middleware.Context) {
@@ -112,7 +118,7 @@ func NewRelease(ctx *middleware.Context) {
ctx.Data["Title"] = "New Release"
ctx.Data["IsRepoToolbarReleases"] = true
ctx.Data["IsRepoReleaseNew"] = true
- ctx.HTML(200, "release/new")
+ ctx.HTML(200, RELEASE_NEW)
}
func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) {
@@ -126,7 +132,7 @@ func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) {
ctx.Data["IsRepoReleaseNew"] = true
if ctx.HasError() {
- ctx.HTML(200, "release/new")
+ ctx.HTML(200, RELEASE_NEW)
return
}
@@ -187,7 +193,7 @@ func EditRelease(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Edit Release"
ctx.Data["IsRepoToolbarReleases"] = true
- ctx.HTML(200, "release/edit")
+ ctx.HTML(200, RELEASE_EDIT)
}
func EditReleasePost(ctx *middleware.Context, params martini.Params, form auth.EditReleaseForm) {
@@ -208,6 +214,11 @@ func EditReleasePost(ctx *middleware.Context, params martini.Params, form auth.E
}
ctx.Data["Release"] = rel
+ if ctx.HasError() {
+ ctx.HTML(200, RELEASE_EDIT)
+ return
+ }
+
ctx.Data["Title"] = "Edit Release"
ctx.Data["IsRepoToolbarReleases"] = true
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 6db45300..6cb6c066 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -25,12 +25,25 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+const (
+ CREATE base.TplName = "repo/create"
+ MIGRATE base.TplName = "repo/migrate"
+ SINGLE base.TplName = "repo/single"
+)
+
func Create(ctx *middleware.Context) {
ctx.Data["Title"] = "Create repository"
ctx.Data["PageIsNewRepo"] = true
ctx.Data["LanguageIgns"] = models.LanguageIgns
ctx.Data["Licenses"] = models.Licenses
- ctx.HTML(200, "repo/create")
+
+ if err := ctx.User.GetOrganizations(); err != nil {
+ ctx.Handle(500, "home.Dashboard(GetOrganizations)", err)
+ return
+ }
+ ctx.Data["Orgs"] = ctx.User.Orgs
+
+ ctx.HTML(200, CREATE)
}
func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
@@ -39,76 +52,125 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
ctx.Data["LanguageIgns"] = models.LanguageIgns
ctx.Data["Licenses"] = models.Licenses
+ if err := ctx.User.GetOrganizations(); err != nil {
+ ctx.Handle(500, "home.CreatePost(GetOrganizations)", err)
+ return
+ }
+ ctx.Data["Orgs"] = ctx.User.Orgs
+
if ctx.HasError() {
- ctx.HTML(200, "repo/create")
+ ctx.HTML(200, CREATE)
return
}
- repo, err := models.CreateRepository(ctx.User, form.RepoName, form.Description,
+ u := ctx.User
+ // Not equal means current user is an organization.
+ if u.Id != form.Uid {
+ var err error
+ u, err = models.GetUserById(form.Uid)
+ if err != nil {
+ if err == models.ErrUserNotExist {
+ ctx.Handle(404, "home.CreatePost(GetUserById)", err)
+ } else {
+ ctx.Handle(500, "home.CreatePost(GetUserById)", err)
+ }
+ return
+ }
+ }
+
+ repo, err := models.CreateRepository(u, form.RepoName, form.Description,
form.Language, form.License, form.Private, false, form.InitReadme)
if err == nil {
- log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName)
- ctx.Redirect("/" + ctx.User.Name + "/" + form.RepoName)
+ log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
+ ctx.Redirect("/" + u.Name + "/" + form.RepoName)
return
} else if err == models.ErrRepoAlreadyExist {
- ctx.RenderWithErr("Repository name has already been used", "repo/create", &form)
+ ctx.RenderWithErr("Repository name has already been used", CREATE, &form)
return
} else if err == models.ErrRepoNameIllegal {
- ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/create", &form)
+ ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), CREATE, &form)
return
}
if repo != nil {
- if errDelete := models.DeleteRepository(ctx.User.Id, repo.Id, ctx.User.Name); errDelete != nil {
- log.Error("repo.MigratePost(CreatePost): %v", errDelete)
+ if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
+ log.Error("repo.CreatePost(DeleteRepository): %v", errDelete)
}
}
- ctx.Handle(500, "repo.Create", err)
+ ctx.Handle(500, "repo.CreatePost(CreateRepository)", err)
}
func Migrate(ctx *middleware.Context) {
ctx.Data["Title"] = "Migrate repository"
ctx.Data["PageIsNewRepo"] = true
- ctx.HTML(200, "repo/migrate")
+
+ if err := ctx.User.GetOrganizations(); err != nil {
+ ctx.Handle(500, "home.Migrate(GetOrganizations)", err)
+ return
+ }
+ ctx.Data["Orgs"] = ctx.User.Orgs
+
+ ctx.HTML(200, MIGRATE)
}
func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
ctx.Data["Title"] = "Migrate repository"
ctx.Data["PageIsNewRepo"] = true
+ if err := ctx.User.GetOrganizations(); err != nil {
+ ctx.Handle(500, "home.MigratePost(GetOrganizations)", err)
+ return
+ }
+ ctx.Data["Orgs"] = ctx.User.Orgs
+
if ctx.HasError() {
- ctx.HTML(200, "repo/migrate")
+ ctx.HTML(200, MIGRATE)
return
}
+ u := ctx.User
+ // Not equal means current user is an organization.
+ if u.Id != form.Uid {
+ var err error
+ u, err = models.GetUserById(form.Uid)
+ if err != nil {
+ if err == models.ErrUserNotExist {
+ ctx.Handle(404, "home.MigratePost(GetUserById)", err)
+ } else {
+ ctx.Handle(500, "home.MigratePost(GetUserById)", err)
+ }
+ return
+ }
+ }
+
authStr := strings.Replace(fmt.Sprintf("://%s:%s",
form.AuthUserName, form.AuthPasswd), "@", "%40", -1)
url := strings.Replace(form.Url, "://", authStr+"@", 1)
- repo, err := models.MigrateRepository(ctx.User, form.RepoName, form.Description, form.Private,
+ repo, err := models.MigrateRepository(u, form.RepoName, form.Description, form.Private,
form.Mirror, url)
if err == nil {
- log.Trace("%s Repository migrated: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName)
- ctx.Redirect("/" + ctx.User.Name + "/" + form.RepoName)
+ log.Trace("%s Repository migrated: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
+ ctx.Redirect("/" + u.Name + "/" + form.RepoName)
return
} else if err == models.ErrRepoAlreadyExist {
- ctx.RenderWithErr("Repository name has already been used", "repo/migrate", &form)
+ ctx.RenderWithErr("Repository name has already been used", MIGRATE, &form)
return
} else if err == models.ErrRepoNameIllegal {
- ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/migrate", &form)
+ ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), MIGRATE, &form)
return
}
if repo != nil {
- if errDelete := models.DeleteRepository(ctx.User.Id, repo.Id, ctx.User.Name); errDelete != nil {
+ if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
log.Error("repo.MigratePost(DeleteRepository): %v", errDelete)
}
}
if strings.Contains(err.Error(), "Authentication failed") {
- ctx.RenderWithErr(err.Error(), "repo/migrate", &form)
+ ctx.RenderWithErr(err.Error(), MIGRATE, &form)
return
}
- ctx.Handle(500, "repo.Migrate", err)
+ ctx.Handle(500, "repo.Migrate(MigrateRepository)", err)
}
func Single(ctx *middleware.Context, params martini.Params) {
@@ -291,7 +353,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
ctx.Data["Treenames"] = treenames
ctx.Data["TreePath"] = treePath
ctx.Data["BranchLink"] = branchLink
- ctx.HTML(200, "repo/single")
+ ctx.HTML(200, SINGLE)
}
func basicEncode(username, password string) string {
@@ -318,7 +380,7 @@ func basicDecode(encoded string) (user string, name string, err error) {
func authRequired(ctx *middleware.Context) {
ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"")
ctx.Data["ErrorMsg"] = "no basic auth and digit auth"
- ctx.HTML(401, fmt.Sprintf("status/401"))
+ ctx.HTML(401, base.TplName("status/401"))
}
func Action(ctx *middleware.Context, params martini.Params) {
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 6313971c..3d48e79c 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -20,10 +20,19 @@ import (
"github.com/gogits/gogs/modules/setting"
)
+const (
+ SETTING base.TplName = "repo/setting"
+ COLLABORATION base.TplName = "repo/collaboration"
+
+ HOOKS base.TplName = "repo/hooks"
+ HOOK_ADD base.TplName = "repo/hook_add"
+ HOOK_EDIT base.TplName = "repo/hook_edit"
+)
+
func Setting(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarSetting"] = true
ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - settings"
- ctx.HTML(200, "repo/setting")
+ ctx.HTML(200, SETTING)
}
func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
@@ -32,7 +41,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
switch ctx.Query("action") {
case "update":
if ctx.HasError() {
- ctx.HTML(200, "repo/setting")
+ ctx.HTML(200, SETTING)
return
}
@@ -44,7 +53,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
ctx.Handle(500, "setting.SettingPost(update: check existence)", err)
return
} else if isExist {
- ctx.RenderWithErr("Repository name has been taken in your repositories.", "repo/setting", nil)
+ ctx.RenderWithErr("Repository name has been taken in your repositories.", SETTING, nil)
return
} else if err = models.ChangeRepositoryName(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name, newRepoName); err != nil {
ctx.Handle(500, "setting.SettingPost(change repository name)", err)
@@ -84,7 +93,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
ctx.Redirect(fmt.Sprintf("/%s/%s/settings", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name))
case "transfer":
if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
- ctx.RenderWithErr("Please make sure you entered repository name is correct.", "repo/setting", nil)
+ ctx.RenderWithErr("Please make sure you entered repository name is correct.", SETTING, nil)
return
} else if ctx.Repo.Repository.IsMirror {
ctx.Error(404)
@@ -98,7 +107,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
ctx.Handle(500, "setting.SettingPost(transfer: check existence)", err)
return
} else if !isExist {
- ctx.RenderWithErr("Please make sure you entered owner name is correct.", "repo/setting", nil)
+ ctx.RenderWithErr("Please make sure you entered owner name is correct.", SETTING, nil)
return
} else if err = models.TransferOwnership(ctx.User, newOwner, ctx.Repo.Repository); err != nil {
ctx.Handle(500, "setting.SettingPost(transfer repository)", err)
@@ -109,7 +118,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
ctx.Redirect("/")
case "delete":
if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
- ctx.RenderWithErr("Please make sure you entered repository name is correct.", "repo/setting", nil)
+ ctx.RenderWithErr("Please make sure you entered repository name is correct.", SETTING, nil)
return
}
@@ -156,7 +165,7 @@ func Collaboration(ctx *middleware.Context) {
}
ctx.Data["Collaborators"] = us
- ctx.HTML(200, "repo/collaboration")
+ ctx.HTML(200, COLLABORATION)
}
func CollaborationPost(ctx *middleware.Context) {
@@ -166,7 +175,7 @@ func CollaborationPost(ctx *middleware.Context) {
ctx.Redirect(ctx.Req.RequestURI)
return
}
- has, err := models.HasAccess(name, repoLink, models.AU_WRITABLE)
+ has, err := models.HasAccess(name, repoLink, models.WRITABLE)
if err != nil {
ctx.Handle(500, "setting.CollaborationPost(HasAccess)", err)
return
@@ -187,7 +196,7 @@ func CollaborationPost(ctx *middleware.Context) {
}
if err = models.AddAccess(&models.Access{UserName: name, RepoName: repoLink,
- Mode: models.AU_WRITABLE}); err != nil {
+ Mode: models.WRITABLE}); err != nil {
ctx.Handle(500, "setting.CollaborationPost(AddAccess)", err)
return
}
@@ -226,13 +235,13 @@ func WebHooks(ctx *middleware.Context) {
}
ctx.Data["Webhooks"] = ws
- ctx.HTML(200, "repo/hooks")
+ ctx.HTML(200, HOOKS)
}
func WebHooksAdd(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarWebHooks"] = true
ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Add Webhook"
- ctx.HTML(200, "repo/hooks_add")
+ ctx.HTML(200, HOOK_ADD)
}
func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) {
@@ -240,7 +249,7 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) {
ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Add Webhook"
if ctx.HasError() {
- ctx.HTML(200, "repo/hooks_add")
+ ctx.HTML(200, HOOK_ADD)
return
}
@@ -293,40 +302,46 @@ func WebHooksEdit(ctx *middleware.Context, params martini.Params) {
w.GetEvent()
ctx.Data["Webhook"] = w
- ctx.HTML(200, "repo/hooks_edit")
+ ctx.HTML(200, HOOK_EDIT)
}
func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth.NewWebhookForm) {
ctx.Data["IsRepoToolbarWebHooks"] = true
ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook"
- if ctx.HasError() {
- ctx.HTML(200, "repo/hooks_add")
- return
- }
-
hookId, _ := base.StrTo(params["id"]).Int64()
if hookId == 0 {
ctx.Handle(404, "setting.WebHooksEditPost", nil)
return
}
+ w, err := models.GetWebhookById(hookId)
+ if err != nil {
+ if err == models.ErrWebhookNotExist {
+ ctx.Handle(404, "setting.WebHooksEditPost(GetWebhookById)", nil)
+ } else {
+ ctx.Handle(500, "setting.WebHooksEditPost(GetWebhookById)", err)
+ }
+ return
+ }
+
+ if ctx.HasError() {
+ ctx.HTML(200, HOOK_EDIT)
+ return
+ }
+
ct := models.JSON
if form.ContentType == "2" {
ct = models.FORM
}
- w := &models.Webhook{
- Id: hookId,
- RepoId: ctx.Repo.Repository.Id,
- Url: form.Url,
- ContentType: ct,
- Secret: form.Secret,
- HookEvent: &models.HookEvent{
- PushOnly: form.PushOnly,
- },
- IsActive: form.Active,
+ w.Url = form.Url
+ w.ContentType = ct
+ w.Secret = form.Secret
+ w.HookEvent = &models.HookEvent{
+ PushOnly: form.PushOnly,
}
+ w.IsActive = form.Active
if err := w.UpdateEvent(); err != nil {
ctx.Handle(500, "setting.WebHooksEditPost(UpdateEvent)", err)
return
Powered by cgit, Themed by Ted Yin.