diff options
| author | Brad Albright <32200834+bhalbright@users.noreply.github.com> | 2020-01-21 04:18:52 -0600 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2020-01-21 10:18:52 +0000 |
| commit | 2f7a747e4f3ace73c6bd475f2415e6ed06431e49 (patch) | |
| tree | 15fe1d8c4efcb039f8938be55b2fc8cabee78ffd /templates/repo | |
| parent | 5cf241b3123a6096076a9cb582d28fb8919969e0 (diff) | |
| download | gitea-2f7a747e4f3ace73c6bd475f2415e6ed06431e49.tar.gz gitea-2f7a747e4f3ace73c6bd475f2415e6ed06431e49.zip | |
Fixed repo link in generated comment for cross repository dependency (#9863)
* fixed link to issue in issue comments after adding/removing a dependency, before links assumed the issue was in the same repository. also changed the format of the displayed issue since the issue will not necessarily be in the same repo
* based on pr comments, changed to use HTMLURL instead of piecing together the issue url, and added an if statement around the issue link display as a nil protection
* only showing repo name in dependency comment if the issue is from another repo
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 658494ac30..40db434dec 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -277,10 +277,20 @@ <span class="text grey"> {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} </span> - <div class="detail"> - <span class="octicon octicon-plus"></span> - <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> - </div> + {{if .DependentIssue}} + <div class="detail"> + <span class="octicon octicon-plus"></span> + <span class="text grey"> + <a href="{{.DependentIssue.HTMLURL}}"> + {{if eq .DependentIssue.RepoID .Issue.RepoID}} + #{{.DependentIssue.Index}} {{.DependentIssue.Title}} + {{else}} + {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}} + {{end}} + </a> + </span> + </div> + {{end}} </div> {{else if eq .Type 20}} <div class="event" id="{{.HashTag}}"> @@ -291,10 +301,20 @@ <span class="text grey"> {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} </span> - <div class="detail"> - <span class="text grey octicon octicon-trashcan"></span> - <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> - </div> + {{if .DependentIssue}} + <div class="detail"> + <span class="text grey octicon octicon-trashcan"></span> + <span class="text grey"> + <a href="{{.DependentIssue.HTMLURL}}"> + {{if eq .DependentIssue.RepoID .Issue.RepoID}} + #{{.DependentIssue.Index}} {{.DependentIssue.Title}} + {{else}} + {{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}} + {{end}} + </a> + </span> + </div> + {{end}} </div> {{else if eq .Type 22}} <div class="event" id="{{.HashTag}}"> |