Skip to content

Commit 7776738

Browse files
committed
move GetPerm to IsUserAllowedToUpdate
1 parent 88fa4c5 commit 7776738

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

routers/repo/pull.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -620,13 +620,7 @@ func UpdatePullRequest(ctx *context.Context) {
620620
return
621621
}
622622

623-
headRepoPerm, err := models.GetUserRepoPermission(issue.PullRequest.HeadRepo, ctx.User)
624-
if err != nil {
625-
ctx.ServerError("GetUserRepoPermission", err)
626-
return
627-
}
628-
629-
allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, headRepoPerm, ctx.User)
623+
allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, ctx.User)
630624
if err != nil {
631625
ctx.ServerError("IsUserAllowedToMerge", err)
632626
return

services/pull/update.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,19 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
5151
}
5252

5353
// IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
54-
func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
54+
func IsUserAllowedToUpdate(pull *models.PullRequest, user *models.User) (bool, error) {
55+
headRepoPerm, err := models.GetUserRepoPermission(pull.HeadRepo, user)
56+
if err != nil {
57+
return false, err
58+
}
59+
5560
pr := &models.PullRequest{
5661
HeadRepoID: pull.BaseRepoID,
5762
BaseRepoID: pull.HeadRepoID,
5863
HeadBranch: pull.BaseBranch,
5964
BaseBranch: pull.HeadBranch,
6065
}
61-
return IsUserAllowedToMerge(pr, p, user)
66+
return IsUserAllowedToMerge(pr, headRepoPerm, user)
6267
}
6368

6469
// GetDiverging determines how many commits a PR is ahead or behind the PR base branch

0 commit comments

Comments
 (0)