diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index bca756aea..e2e6c2799 100644 --- 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 2fb42b0f2..4d8377377 100644 --- 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 b4056cc6d..3e81ea045 100644 --- 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) }