From 918e6405904459a3a544541b3b351278bafa6a04 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 17 Jan 2020 20:38:53 +0800 Subject: [PATCH] =?utf8?q?Fix=20wrong=20identify=20poster=20on=20a=20migra?= =?utf8?q?ted=20pull=20request=20when=20submi=E2=80=A6=20(#9827)=20(#9831)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- models/issue.go | 2 +- 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 { -- 2.39.5