aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2020-01-17 18:23:46 +0800
committerAntoine GIRARD <sapk@users.noreply.github.com>2020-01-17 11:23:46 +0100
commit088759f180176dab8af98694a6efbac1c5a867fc (patch)
tree68342d4271eacf041f2e50d46563dfa606f0a38b
parent3c07d03c0388d3b86138572401281b51f2db9282 (diff)
downloadgitea-088759f180176dab8af98694a6efbac1c5a867fc.tar.gz
gitea-088759f180176dab8af98694a6efbac1c5a867fc.zip
Fix wrong identify poster on a migrated pull request when submi… (#9827)
-rw-r--r--models/issue.go2
-rw-r--r--routers/repo/pull_review.go2
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")