Remove unnecessary permissions load (#9796)

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <matti@mdranta.net>

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index bca756aea160a6b949330a9b3a0cac65ce7b32d7..e2e6c2799bd55707b6f0b6ff3f0af5fb50d7d3af 100644 (file)
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -600,13 +600,7 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
                return
        }
 
-       perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
-       if err != nil {
-               ctx.Error(http.StatusInternalServerError, "GetUserRepoPermission", err)
-               return
-       }
-
-       allowedMerge, err := pull_service.IsUserAllowedToMerge(pr, perm, ctx.User)
+       allowedMerge, err := pull_service.IsUserAllowedToMerge(pr, ctx.Repo.Permission, ctx.User)
        if err != nil {
                ctx.Error(http.StatusInternalServerError, "IsUSerAllowedToMerge", err)
                return

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 2fb42b0f22ccd49c5d71411ee77c1ea07042439b..4d837737746c5f41b944d74258898d6c86a74bd3 100644 (file)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -316,12 +316,7 @@ func Issues(ctx *context.Context) {
                return
        }
 
-       perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
-       if err != nil {
-               ctx.ServerError("GetUserRepoPermission", err)
-               return
-       }
-       ctx.Data["CanWriteIssuesOrPulls"] = perm.CanWriteIssuesOrPulls(isPullList)
+       ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
 
        ctx.HTML(200, tplIssues)
 }

diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go
index b4056cc6d1ab64de7e76fc74b43ca65263b33b90..3e81ea045232cbaea4fbbaf9bcd3663c909c3a82 100644 (file)
--- a/routers/repo/milestone.go
+++ b/routers/repo/milestone.go
@@ -268,13 +268,8 @@ func MilestoneIssuesAndPulls(ctx *context.Context) {
 
        issues(ctx, milestoneID, util.OptionalBoolNone)
 
-       perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
-       if err != nil {
-               ctx.ServerError("GetUserRepoPermission", err)
-               return
-       }
-       ctx.Data["CanWriteIssues"] = perm.CanWriteIssuesOrPulls(false)
-       ctx.Data["CanWritePulls"] = perm.CanWriteIssuesOrPulls(true)
+       ctx.Data["CanWriteIssues"] = ctx.Repo.CanWriteIssuesOrPulls(false)
+       ctx.Data["CanWritePulls"] = ctx.Repo.CanWriteIssuesOrPulls(true)
 
        ctx.HTML(200, tplMilestoneIssues)
 }