From be3a13a0d6e5ba00cf364db4fada77f9f77e3521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Boulanouar?= <rboulanouar@gmail.com>
Date: Wed, 1 Feb 2017 02:53:48 +0100
Subject: [PATCH] Allow use to set an external tracker url and to redirect user
 when clicking in Issues same behavior as Wiki. (#3646)

---
 conf/locale/locale_en-US.ini         | 2 ++
 models/repo.go                       | 1 +
 modules/auth/repo_form.go            | 1 +
 routers/repo/issue.go                | 7 ++++++-
 routers/repo/setting.go              | 1 +
 templates/repo/header.tmpl           | 4 ++--
 templates/repo/settings/options.tmpl | 5 +++++
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 19c6c21c..869f1a24 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -656,6 +656,8 @@ settings.external_wiki_url_desc = Visitors will be redirected to URL when they c
 settings.issues_desc = Enable issue tracker
 settings.use_internal_issue_tracker = Use builtin lightweight issue tracker
 settings.use_external_issue_tracker = Use external issue tracker
+settings.external_tracker_url = External Issue Tracker URL
+settings.external_tracker_url_desc = Visitors will be redirected to URL when they click on the tab.
 settings.tracker_url_format = External Issue Tracker URL Format
 settings.tracker_issue_style = External Issue Tracker Naming Style:
 settings.tracker_issue_style.numeric = Numeric
diff --git a/models/repo.go b/models/repo.go
index 2e52cd1e..0a2f67a1 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -186,6 +186,7 @@ type Repository struct {
 	ExternalWikiURL       string
 	EnableIssues          bool `xorm:"NOT NULL DEFAULT true"`
 	EnableExternalTracker bool
+	ExternalTrackerURL    string
 	ExternalTrackerFormat string
 	ExternalTrackerStyle  string
 	ExternalMetas         map[string]string `xorm:"-"`
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 958bce7d..b357c3b3 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -96,6 +96,7 @@ type RepoSettingForm struct {
 	ExternalWikiURL       string
 	EnableIssues          bool
 	EnableExternalTracker bool
+	ExternalTrackerURL    string
 	TrackerURLFormat      string
 	TrackerIssueStyle     string
 	EnablePulls           bool
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 83a6c354..b57c7e91 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -52,10 +52,15 @@ var (
 )
 
 func MustEnableIssues(ctx *context.Context) {
-	if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker {
+	if !ctx.Repo.Repository.EnableIssues {
 		ctx.Handle(404, "MustEnableIssues", nil)
 		return
 	}
+
+	if ctx.Repo.Repository.EnableExternalTracker {
+		ctx.Redirect(ctx.Repo.Repository.ExternalTrackerURL)
+		return
+	}
 }
 
 func MustAllowPulls(ctx *context.Context) {
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 52173827..01228da8 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -147,6 +147,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 		repo.ExternalWikiURL = form.ExternalWikiURL
 		repo.EnableIssues = form.EnableIssues
 		repo.EnableExternalTracker = form.EnableExternalTracker
+		repo.ExternalTrackerURL = form.ExternalTrackerURL
 		repo.ExternalTrackerFormat = form.TrackerURLFormat
 		repo.ExternalTrackerStyle = form.TrackerIssueStyle
 		repo.EnablePulls = form.EnablePulls
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index d8137dbb..69842d73 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -52,9 +52,9 @@
 			<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
 				<i class="octicon octicon-file-text"></i> {{.i18n.Tr "repo.files"}}
 			</a>
-			{{if and .Repository.EnableIssues (not .Repository.EnableExternalTracker)}}
+			{{if .Repository.EnableIssues}}
 				<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>
+					<i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} {{if not .Repository.EnableExternalTracker}}<span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}{{end}}</span>
 				</a>
 			{{end}}
 			{{if .Repository.AllowsPulls}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 6b61cb7f..2588966c 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -161,6 +161,11 @@
 								</div>
 							</div>
 							<div class="field {{if not .Repository.EnableExternalTracker}}disabled{{end}}" id="external_issue_box">
+								<div class="field">
+									<label for="external_tracker_url">{{.i18n.Tr "repo.settings.external_tracker_url"}}</label>
+									<input id="external_tracker_url" name="external_tracker_url" type="url" value="{{.Repository.ExternalTrackerURL}}">
+									<p class="help">{{.i18n.Tr "repo.settings.external_tracker_url_desc"}}</p>
+								</div>
 								<div class="field">
 									<label for="tracker_url_format">{{.i18n.Tr "repo.settings.tracker_url_format"}}</label>
 									<input id="tracker_url_format" name="tracker_url_format" type="url" value="{{.Repository.ExternalTrackerFormat}}" placeholder="e.g. https://github.com/{user}/{repo}/issues/{index}">