Skip to content

Commit dbd89ac

Browse files
lunnylafrikstechknowlogick
authored andcommitted
Remove unnecessary permissions load (#9796)
Co-authored-by: Lauris BH <[email protected]> Co-authored-by: techknowlogick <[email protected]>
1 parent f740943 commit dbd89ac

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

routers/api/v1/repo/pull.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,7 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
600600
return
601601
}
602602

603-
perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
604-
if err != nil {
605-
ctx.Error(http.StatusInternalServerError, "GetUserRepoPermission", err)
606-
return
607-
}
608-
609-
allowedMerge, err := pull_service.IsUserAllowedToMerge(pr, perm, ctx.User)
603+
allowedMerge, err := pull_service.IsUserAllowedToMerge(pr, ctx.Repo.Permission, ctx.User)
610604
if err != nil {
611605
ctx.Error(http.StatusInternalServerError, "IsUSerAllowedToMerge", err)
612606
return

routers/repo/issue.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,7 @@ func Issues(ctx *context.Context) {
316316
return
317317
}
318318

319-
perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
320-
if err != nil {
321-
ctx.ServerError("GetUserRepoPermission", err)
322-
return
323-
}
324-
ctx.Data["CanWriteIssuesOrPulls"] = perm.CanWriteIssuesOrPulls(isPullList)
319+
ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
325320

326321
ctx.HTML(200, tplIssues)
327322
}

routers/repo/milestone.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,8 @@ func MilestoneIssuesAndPulls(ctx *context.Context) {
268268

269269
issues(ctx, milestoneID, util.OptionalBoolNone)
270270

271-
perm, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
272-
if err != nil {
273-
ctx.ServerError("GetUserRepoPermission", err)
274-
return
275-
}
276-
ctx.Data["CanWriteIssues"] = perm.CanWriteIssuesOrPulls(false)
277-
ctx.Data["CanWritePulls"] = perm.CanWriteIssuesOrPulls(true)
271+
ctx.Data["CanWriteIssues"] = ctx.Repo.CanWriteIssuesOrPulls(false)
272+
ctx.Data["CanWritePulls"] = ctx.Repo.CanWriteIssuesOrPulls(true)
278273

279274
ctx.HTML(200, tplMilestoneIssues)
280275
}

0 commit comments

Comments
 (0)