Skip to content

Commit 381e131

Browse files
author
Gusted
authoredNov 19, 2021
Added comment for changing issue ref (#17672)
* Added comment for changing issue ref - Add a comment when someone changes the ref(erence?) of a issue.
1 parent 00448eb commit 381e131

File tree

4 files changed

+41
-1
lines changed

4 files changed

+41
-1
lines changed
 

‎models/issue.go

+18
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,24 @@ func (issue *Issue) ChangeRef(doer *User, oldRef string) (err error) {
753753
return fmt.Errorf("updateIssueCols: %v", err)
754754
}
755755

756+
if err = issue.loadRepo(db.GetEngine(ctx)); err != nil {
757+
return fmt.Errorf("loadRepo: %v", err)
758+
}
759+
oldRefFriendly := strings.TrimPrefix(oldRef, "refs/heads/")
760+
newRefFriendly := strings.TrimPrefix(issue.Ref, "refs/heads/")
761+
762+
opts := &CreateCommentOptions{
763+
Type: CommentTypeChangeIssueRef,
764+
Doer: doer,
765+
Repo: issue.Repo,
766+
Issue: issue,
767+
OldRef: oldRefFriendly,
768+
NewRef: newRefFriendly,
769+
}
770+
if _, err = createComment(db.GetEngine(ctx), opts); err != nil {
771+
return fmt.Errorf("createComment: %v", err)
772+
}
773+
756774
return committer.Commit()
757775
}
758776

‎models/issue_comment.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ const (
101101
CommentTypeProject
102102
// 31 Project board changed
103103
CommentTypeProjectBoard
104-
// Dismiss Review
104+
// 32 Dismiss Review
105105
CommentTypeDismissReview
106+
// 33 Change issue ref
107+
CommentTypeChangeIssueRef
106108
)
107109

108110
// RoleDescriptor defines comment tag type

‎options/locale/locale_en-US.ini

+3
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,9 @@ issues.add_assignee_at = `was assigned by <b>%s</b> %s`
11731173
issues.remove_assignee_at = `was unassigned by <b>%s</b> %s`
11741174
issues.remove_self_assignment = `removed their assignment %s`
11751175
issues.change_title_at = `changed title from <b><strike>%s</strike></b> to <b>%s</b> %s`
1176+
issues.change_ref_at = `changed reference from <b><strike>%s</strike></b> to <b>%s</b> %s`
1177+
issues.remove_ref_at = `removed reference <b>%s</b> %s`
1178+
issues.add_ref_at = `added reference <b>%s</b> %s`
11761179
issues.delete_branch_at = `deleted branch <b>%s</b> %s`
11771180
issues.open_tab = %d Open
11781181
issues.close_tab = %d Closed

‎templates/repo/issue/view_content/comments.tmpl

+17
Original file line numberDiff line numberDiff line change
@@ -781,5 +781,22 @@
781781
</div>
782782
{{end}}
783783
</div>
784+
{{else if eq .Type 33}}
785+
<div class="timeline-item event" id="{{.HashTag}}">
786+
<span class="badge">{{svg "octicon-git-branch"}}</span>
787+
<a href="{{.Poster.HomeLink}}">
788+
{{avatar .Poster}}
789+
</a>
790+
<span class="text grey">
791+
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
792+
{{if and .OldRef .NewRef}}
793+
{{$.i18n.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
794+
{{else if .OldRef}}
795+
{{$.i18n.Tr "repo.issues.remove_ref_at" (.OldRef|Escape) $createdStr | Safe}}
796+
{{else}}
797+
{{$.i18n.Tr "repo.issues.add_ref_at" (.NewRef|Escape) $createdStr | Safe}}
798+
{{end}}
799+
</span>
800+
</div>
784801
{{end}}
785802
{{end}}

0 commit comments

Comments
 (0)
Please sign in to comment.