diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2021-02-18 03:45:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 03:45:49 +0100 |
| commit | 4c82485424adb0fcf72cf9cde74596a7f0f54ada (patch) | |
| tree | 97554f86469f5a6e7f6fd2f79f668a8ba7749e16 | |
| parent | 7ab6c77b4120d96b3239f827da8b858f65c36863 (diff) | |
| download | gitea-4c82485424adb0fcf72cf9cde74596a7f0f54ada.tar.gz gitea-4c82485424adb0fcf72cf9cde74596a7f0f54ada.zip | |
#14699 Make branch names in PR description clickable (#14716)
| -rw-r--r-- | models/pull.go | 25 | ||||
| -rw-r--r-- | routers/repo/pull.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 20 |
3 files changed, 41 insertions, 6 deletions
diff --git a/models/pull.go b/models/pull.go index 0d4691aac9..0eba65db4f 100644 --- a/models/pull.go +++ b/models/pull.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" ) // PullRequestType defines pull request type @@ -638,3 +639,27 @@ func (pr *PullRequest) updateCommitDivergence(e Engine, ahead, behind int) error func (pr *PullRequest) IsSameRepo() bool { return pr.BaseRepoID == pr.HeadRepoID } + +// GetBaseBranchHTMLURL returns the HTML URL of the base branch +func (pr *PullRequest) GetBaseBranchHTMLURL() string { + if err := pr.LoadBaseRepo(); err != nil { + log.Error("LoadBaseRepo: %v", err) + return "" + } + if pr.BaseRepo == nil { + return "" + } + return pr.BaseRepo.HTMLURL() + "/src/branch/" + util.PathEscapeSegments(pr.BaseBranch) +} + +// GetHeadBranchHTMLURL returns the HTML URL of the head branch +func (pr *PullRequest) GetHeadBranchHTMLURL() string { + if err := pr.LoadHeadRepo(); err != nil { + log.Error("LoadHeadRepo: %v", err) + return "" + } + if pr.HeadRepo == nil { + return "" + } + return pr.HeadRepo.HTMLURL() + "/src/branch/" + util.PathEscapeSegments(pr.HeadBranch) +} diff --git a/routers/repo/pull.go b/routers/repo/pull.go index d3dd9e4fb5..15af2a2a3f 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -301,6 +301,8 @@ func setMergeTarget(ctx *context.Context, pull *models.PullRequest) { ctx.Data["HeadTarget"] = pull.MustHeadUserName() + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch } ctx.Data["BaseTarget"] = pull.BaseBranch + ctx.Data["HeadBranchHTMLURL"] = pull.GetHeadBranchHTMLURL() + ctx.Data["BaseBranchHTMLURL"] = pull.GetBaseBranchHTMLURL() } // PrepareMergedViewPullInfo show meta information for a merged pull request view page diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 8956bf5e65..2f2787d67c 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -30,23 +30,31 @@ {{end}} {{if .Issue.IsPull}} + {{$headHref := .HeadTarget|Escape}} + {{if .HeadBranchHTMLURL}} + {{$headHref = printf "<a href=\"%s\">%s</a>" .HeadBranchHTMLURL $headHref}} + {{end}} + {{$baseHref := .BaseTarget|Escape}} + {{if .BaseBranchHTMLURL}} + {{$baseHref = printf "<a href=\"%s\">%s</a>" .BaseBranchHTMLURL $baseHref}} + {{end}} {{if .Issue.PullRequest.HasMerged}} {{ $mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.Lang }} {{if .Issue.OriginalAuthor }} {{.Issue.OriginalAuthor}} - <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits (.HeadTarget|Escape) (.BaseTarget|Escape) $mergedStr | Str2html}}</span> + <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Str2html}}</span> {{else}} <a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a> - <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits (.HeadTarget|Escape) (.BaseTarget|Escape) $mergedStr | Str2html}}</span> + <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Str2html}}</span> {{end}} {{else}} {{if .Issue.OriginalAuthor }} - <span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits (.HeadTarget|Escape) (.BaseTarget|Escape) | Str2html}}</span> + <span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Str2html}}</span> {{else}} <span id="pull-desc" class="pull-desc"> - <a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> - {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits (.HeadTarget|Escape) (.BaseTarget|Escape) | Str2html}} - </span> + <a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> + {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Str2html}} + </span> {{end}} <span id="pull-desc-edit" style="display: none"> <div class="ui floating filter dropdown"> |