From 1df701fd1abbcee93dfcd3cdb114a0f35cb6be45 Mon Sep 17 00:00:00 2001 From: mrsdizzie Date: Sun, 22 Dec 2019 03:29:26 -0500 Subject: Add ActionCommentPull action (#9456) * Add ActionCommentPull action Adds ActionCommentPull action to distinguish between a comment on an issue and on a pull request * Update modules/notification/action/action.go Co-authored-by: Lunny Xiao --- templates/user/dashboard/feeds.tmpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 48cdb49c15..7c4b1da0c7 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -67,6 +67,9 @@ {{else if eq .GetOpType 22}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.reject_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 23}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{end}}

{{if or (eq .GetOpType 5) (eq .GetOpType 18)}} @@ -86,7 +89,7 @@ {{index .GetIssueInfos 1}} {{else if eq .GetOpType 7}} {{index .GetIssueInfos 1}} - {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22)}} + {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} {{.GetIssueTitle}}

{{index .GetIssueInfos 1}}

{{else if eq .GetOpType 11}} -- cgit v1.2.3