Skip to content
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

Jump to bottom

Added comment for changing issue ref #17672

Merged
merged 10 commits into from
Nov 19, 2021
Merged

Added comment for changing issue ref #17672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca611dc
Added comment for changing issue ref
Nov 16, 2021
d87c38f
Better beautify
Nov 17, 2021
cd7449e
Merge branch 'main' into issue-ref-comment
Nov 17, 2021
ae77a57
Remove unused function
Nov 17, 2021
3b448a9
Update models/issue.go
Nov 18, 2021
2bd4a30
Merge branch 'main' into issue-ref-comment
zeripath Nov 18, 2021
0e7db83
Merge branch 'main' into issue-ref-comment
wxiaoguang Nov 19, 2021
a829d52
Merge branch 'main' into issue-ref-comment
lunny Nov 19, 2021
aeb82f7
Merge branch 'main' into issue-ref-comment
lunny Nov 19, 2021
aa9b22a
Merge branch 'main' into issue-ref-comment
zeripath Nov 19, 2021
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
18 changes: 18 additions & 0 deletions models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,24 @@ func (issue *Issue) ChangeRef(doer *User, oldRef string) (err error) {
return fmt.Errorf("updateIssueCols: %v", err)
}

if err = issue.loadRepo(db.GetEngine(ctx)); err != nil {
return fmt.Errorf("loadRepo: %v", err)
}
oldRefFriendly := strings.TrimPrefix(oldRef, "refs/heads/")
newRefFriendly := strings.TrimPrefix(issue.Ref, "refs/heads/")

opts := &CreateCommentOptions{
Type: CommentTypeChangeIssueRef,
Doer: doer,
Repo: issue.Repo,
Issue: issue,
OldRef: oldRefFriendly,
NewRef: newRefFriendly,
}
if _, err = createComment(db.GetEngine(ctx), opts); err != nil {
return fmt.Errorf("createComment: %v", err)
}

return committer.Commit()
}

Expand Down
4 changes: 3 additions & 1 deletion models/issue_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ const (
CommentTypeProject
// 31 Project board changed
CommentTypeProjectBoard
// Dismiss Review
// 32 Dismiss Review
CommentTypeDismissReview
// 33 Change issue ref
CommentTypeChangeIssueRef
)

// RoleDescriptor defines comment tag type
Expand Down
3 changes: 3 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,9 @@ issues.add_assignee_at = `was assigned by <b>%s</b> %s`
issues.remove_assignee_at = `was unassigned by <b>%s</b> %s`
issues.remove_self_assignment = `removed their assignment %s`
issues.change_title_at = `changed title from <b><strike>%s</strike></b> to <b>%s</b> %s`
issues.change_ref_at = `changed reference from <b><strike>%s</strike></b> to <b>%s</b> %s`
issues.remove_ref_at = `removed reference <b>%s</b> %s`
issues.add_ref_at = `added reference <b>%s</b> %s`
issues.delete_branch_at = `deleted branch <b>%s</b> %s`
issues.open_tab = %d Open
issues.close_tab = %d Closed
Expand Down
17 changes: 17 additions & 0 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 @@ -781,5 +781,22 @@
</div>
{{end}}
</div>
{{else if eq .Type 33}}
<div class="timeline-item event" id="{{.HashTag}}">
<span class="badge">{{svg "octicon-git-branch"}}</span>
<a href="{{.Poster.HomeLink}}">
{{avatar .Poster}}
</a>
<span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{if and .OldRef .NewRef}}
{{$.i18n.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
{{else if .OldRef}}
{{$.i18n.Tr "repo.issues.remove_ref_at" (.OldRef|Escape) $createdStr | Safe}}
{{else}}
{{$.i18n.Tr "repo.issues.add_ref_at" (.NewRef|Escape) $createdStr | Safe}}
{{end}}
</span>
</div>
{{end}}
{{end}}