From 088759f180176dab8af98694a6efbac1c5a867fc Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 17 Jan 2020 18:23:46 +0800 Subject: Fix wrong identify poster on a migrated pull request when submi… (#9827) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/issue.go | 2 +- routers/repo/pull_review.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index 1c6b930d2e..7976366058 100644 --- a/models/issue.go +++ b/models/issue.go @@ -440,7 +440,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 558473eb08..9fcb02cd4a 100644 --- a/routers/repo/pull_review.go +++ b/routers/repo/pull_review.go @@ -83,7 +83,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 { translated = ctx.Tr("repo.issues.review.self.approval") -- cgit v1.2.3