diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-01-17 20:38:53 +0800 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-01-17 13:38:53 +0100 |
| commit | 918e6405904459a3a544541b3b351278bafa6a04 (patch) | |
| tree | 7505ab03885f840ae601a9f04626911c9523e98c | |
| parent | 9809fe27c41d1a639b2104a046e292215eed3953 (diff) | |
| download | gitea-918e6405904459a3a544541b3b351278bafa6a04.tar.gz gitea-918e6405904459a3a544541b3b351278bafa6a04.zip | |
Fix wrong identify poster on a migrated pull request when submi… (#9827) (#9831)
| -rw-r--r-- | models/issue.go | 2 | ||||
| -rw-r--r-- | routers/repo/pull_review.go | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/models/issue.go b/models/issue.go index 7c2eecadbc..a0353f0be1 100644 --- a/models/issue.go +++ b/models/issue.go @@ -429,7 +429,7 @@ func (issue *Issue) HashTag() string { // IsPoster returns true if given user by ID is the poster. func (issue *Issue) IsPoster(uid int64) bool { - return issue.PosterID == uid + return issue.OriginalAuthorID == 0 && issue.PosterID == uid } func (issue *Issue) hasLabel(e Engine, labelID int64) bool { diff --git a/routers/repo/pull_review.go b/routers/repo/pull_review.go index 4c17537071..601fb44c2c 100644 --- a/routers/repo/pull_review.go +++ b/routers/repo/pull_review.go @@ -117,9 +117,7 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) { // can not approve/reject your own PR case models.ReviewTypeApprove, models.ReviewTypeReject: - - if issue.Poster.ID == ctx.User.ID { - + if issue.IsPoster(ctx.User.ID) { var translated string if reviewType == models.ReviewTypeApprove { |