move GetPerm to IsUserAllowedToUpdate

go-gitea · Jan 16, 2020 · 7776738 · 7776738
1 parent 88fa4c5
commit 7776738
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
@@ -620,13 +620,7 @@ func UpdatePullRequest(ctx *context.Context) {
  return
  }
 
- headRepoPerm, err := models.GetUserRepoPermission(issue.PullRequest.HeadRepo, ctx.User)
- if err != nil {
- ctx.ServerError("GetUserRepoPermission", err)
- return
- }
-
- allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, headRepoPerm, ctx.User)
+ allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, ctx.User)
  if err != nil {
  ctx.ServerError("IsUserAllowedToMerge", err)
  return

diff --git a/services/pull/update.go b/services/pull/update.go
@@ -51,14 +51,19 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
 }
 
 // IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
-func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
+func IsUserAllowedToUpdate(pull *models.PullRequest, user *models.User) (bool, error) {
+ headRepoPerm, err := models.GetUserRepoPermission(pull.HeadRepo, user)
+ if err != nil {
+ return false, err
+ }
+
  pr := &models.PullRequest{
  HeadRepoID: pull.BaseRepoID,
  BaseRepoID: pull.HeadRepoID,
  HeadBranch: pull.BaseBranch,
  BaseBranch: pull.HeadBranch,
  }
- return IsUserAllowedToMerge(pr, p, user)
+ return IsUserAllowedToMerge(pr, headRepoPerm, user)
 }
 
 // GetDiverging determines how many commits a PR is ahead or behind the PR base branch