diff options
| author | John Olheiser <42128690+jolheiser@users.noreply.github.com> | 2019-11-14 17:52:18 -0600 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-11-15 00:52:18 +0100 |
| commit | 06a8504c784fe404bcae92028515add816383729 (patch) | |
| tree | 66bade651d9bc6f18165ef089f501139f4ecbd38 /modules/notification/action | |
| parent | dd1beee2ef907527d0b046f78bab70b2bd868c55 (diff) | |
| download | gitea-06a8504c784fe404bcae92028515add816383729.tar.gz gitea-06a8504c784fe404bcae92028515add816383729.zip | |
Update dashboard context for PR reviews (#8995)
* Update dashboard context for PR reviews
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update options/locale/locale_en-US.ini
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Only append head action if it has content or is approval/rejection
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update options/locale/locale_en-US.ini
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'modules/notification/action')
| -rw-r--r-- | modules/notification/action/action.go | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index 36035b864f..d4be1e4304 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -148,18 +148,28 @@ func (a *actionNotifier) NotifyPullRequestReview(pr *models.PullRequest, review } } - if strings.TrimSpace(comment.Content) != "" { - actions = append(actions, &models.Action{ + if review.Type != models.ReviewTypeComment || strings.TrimSpace(comment.Content) != "" { + action := &models.Action{ ActUserID: review.Reviewer.ID, ActUser: review.Reviewer, Content: fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(comment.Content, "\n")[0]), - OpType: models.ActionCommentIssue, RepoID: review.Issue.RepoID, Repo: review.Issue.Repo, IsPrivate: review.Issue.Repo.IsPrivate, Comment: comment, CommentID: comment.ID, - }) + } + + switch review.Type { + case models.ReviewTypeApprove: + action.OpType = models.ActionApprovePullRequest + case models.ReviewTypeReject: + action.OpType = models.ActionRejectPullRequest + default: + action.OpType = models.ActionCommentIssue + } + + actions = append(actions, action) } if err := models.NotifyWatchersActions(actions); err != nil { |