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.

diff --git a/models/issue.go b/models/issue.go
index 288163707a466da348fdd4862ce3012cb0c116d2..ef31f416ad3ada8523c11635889279a19e72b397 100644 (file)
--- a/models/issue.go
+++ b/models/issue.go
@@ -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()
 }
 

diff --git a/models/issue_comment.go b/models/issue_comment.go
index a41f4cb298a46057ef1e2f605d3c114bb35b2361..1936695732158f378524bb21751bbd72f8e3507e 100644 (file)
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -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

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 66996b201456715f1812e0535eed93b56dc27db8..21e2bd1be432b2228a2a076b6319ac35337b18e7 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -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

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 9907246d9f403c5d2d89352925b75e35f74f4071..77925d8e29efedd742bae5c06a5bf93766b0a3b5 100644 (file)
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -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}}