From 2f105f397965637c46ca6c0092a7c5fe38440dab Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 4 Aug 2016 16:32:02 -0700
Subject: [PATCH] #2162 completely disable builtin issue tracker when enable
external tracker
---
README.md | 2 +-
cmd/web.go | 8 ++++----
gogs.go | 2 +-
routers/api/v1/api.go | 9 ++++++++-
routers/repo/issue.go | 2 +-
templates/.VERSION | 2 +-
templates/repo/header.tmpl | 2 +-
7 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 8dfd8c44d0..ce80c414de 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [
-##### Current tip version: 0.9.60 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.61 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
| Web | UI | Preview |
|:-------------:|:-------:|:-------:|
diff --git a/cmd/web.go b/cmd/web.go
index dfd0201305..39e297ee34 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -449,7 +449,7 @@ func runWeb(ctx *cli.Context) error {
m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action)
m.Group("/:username/:reponame", func() {
m.Group("/issues", func() {
- m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
+ m.Combo("/new").Get(context.RepoRef(), repo.NewIssue).
Post(bindIgnErr(auth.CreateIssueForm{}), repo.NewIssuePost)
m.Combo("/:index/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
@@ -463,7 +463,7 @@ func runWeb(ctx *cli.Context) error {
m.Post("/title", repo.UpdateIssueTitle)
m.Post("/content", repo.UpdateIssueContent)
})
- })
+ }, repo.MustEnableIssues)
m.Group("/comments/:id", func() {
m.Post("", repo.UpdateCommentContent)
m.Post("/delete", repo.DeleteComment)
@@ -472,7 +472,7 @@ func runWeb(ctx *cli.Context) error {
m.Post("/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel)
m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel)
m.Post("/delete", repo.DeleteLabel)
- }, reqRepoWriter, context.RepoRef())
+ }, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())
m.Group("/milestones", func() {
m.Combo("/new").Get(repo.NewMilestone).
Post(bindIgnErr(auth.CreateMilestoneForm{}), repo.NewMilestonePost)
@@ -480,7 +480,7 @@ func runWeb(ctx *cli.Context) error {
m.Post("/:id/edit", bindIgnErr(auth.CreateMilestoneForm{}), repo.EditMilestonePost)
m.Get("/:id/:action", repo.ChangeMilestonStatus)
m.Post("/delete", repo.DeleteMilestone)
- }, reqRepoWriter, context.RepoRef())
+ }, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())
m.Group("/releases", func() {
m.Get("/new", repo.NewRelease)
diff --git a/gogs.go b/gogs.go
index 43579f7807..6a6328db23 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.9.60.0803"
+const APP_VER = "0.9.61.0804"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index e4398458f5..d0d4914459 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -151,6 +151,13 @@ func OrgAssignment(args ...bool) macaron.Handler {
}
}
+func MustEnableIssues(ctx *context.APIContext) {
+ if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker {
+ ctx.Status(404)
+ return
+ }
+}
+
// RegisterRoutes registers all v1 APIs routes to web application.
// FIXME: custom form error response
func RegisterRoutes(m *macaron.Macaron) {
@@ -252,7 +259,7 @@ func RegisterRoutes(m *macaron.Macaron) {
})
})
- })
+ }, MustEnableIssues)
m.Group("/labels", func() {
m.Combo("").Get(repo.ListLabels).
Post(bind(api.CreateLabelOption{}), repo.CreateLabel)
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 91d0c7b99e..3849da25d5 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -52,7 +52,7 @@ var (
)
func MustEnableIssues(ctx *context.Context) {
- if !ctx.Repo.Repository.EnableIssues {
+ if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker {
ctx.Handle(404, "MustEnableIssues", nil)
return
}
diff --git a/templates/.VERSION b/templates/.VERSION
index 3e31f4ddfc..f60bbf6177 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.9.60.0803
\ No newline at end of file
+0.9.61.0804
\ No newline at end of file
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index d9ac29fbf9..10bfb80e11 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -52,7 +52,7 @@
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<i class="octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
</a>
- {{if .Repository.EnableIssues}}
+ {{if and .Repository.EnableIssues (not .Repository.EnableExternalTracker)}}
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
<i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
</a>