Skip to content

Fixed repo link in generated comment for cross repository dependency #9863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 21, 2020
Merged

Fixed repo link in generated comment for cross repository dependency #9863

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
370a479
fixed link to issue in issue comments after adding/removing a depende…
bhalbright Jan 19, 2020
3d83e0f
Merge branch 'master' of https://github.com/go-gitea/gitea into cross…
bhalbright Jan 19, 2020
79c64dd
based on pr comments, changed to use HTMLURL instead of piecing toget…
bhalbright Jan 20, 2020
942decf
Merge branch 'master' of https://github.com/go-gitea/gitea into cross…
bhalbright Jan 20, 2020
547455b
only showing repo name in dependency comment if the issue is from ano…
bhalbright Jan 21, 2020
8409032
Merge branch 'master' of https://github.com/go-gitea/gitea into cross…
bhalbright Jan 21, 2020
0e05900
Merge branch 'master' into cross-repo-comment
sapk Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions models/issue_comment_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,11 @@ func (comments CommentList) loadDependentIssues(e Engine) error {
for _, comment := range comments {
if comment.DependentIssue == nil {
comment.DependentIssue = issues[comment.DependentIssueID]
if comment.DependentIssue != nil {
if err := comment.DependentIssue.loadRepo(e); err != nil {
return err
}
}
}
}
return nil
Expand Down
20 changes: 12 additions & 8 deletions templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,12 @@
<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}}">{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}</a></span>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If current repo != dependentissue.repo ...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Only show repo name if needed)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @6543 and @lunny I changed as suggested:

image

</div>
{{end}}
</div>
{{else if eq .Type 20}}
<div class="event" id="{{.HashTag}}">
Expand All @@ -291,10 +293,12 @@
<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}}">{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}</a></span>
</div>
{{end}}
</div>
{{else if eq .Type 22}}
<div class="event" id="{{.HashTag}}">
Expand Down