From ec0ae5d50c59315a3c597b1cf24d4c5508c718e5 Mon Sep 17 00:00:00 2001 From: Ethan Koenig Date: Tue, 14 Mar 2017 20:51:46 -0400 Subject: Refactor and fix incorrect comment (#1247) --- modules/context/repo.go | 2 +- modules/lfs/server.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/context/repo.go b/modules/context/repo.go index 1ae98545a7..76af49ffd7 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -219,7 +219,7 @@ func RepoAssignment(args ...bool) macaron.Handler { if ctx.IsSigned && ctx.User.IsAdmin { ctx.Repo.AccessMode = models.AccessModeOwner } else { - mode, err := models.AccessLevel(ctx.User, repo) + mode, err := models.AccessLevel(ctx.User.ID, repo) if err != nil { ctx.Handle(500, "AccessLevel", err) return diff --git a/modules/lfs/server.go b/modules/lfs/server.go index 1bdeadc463..782d972fa9 100644 --- a/modules/lfs/server.go +++ b/modules/lfs/server.go @@ -463,7 +463,7 @@ func authenticate(ctx *context.Context, repository *models.Repository, authoriza } if ctx.IsSigned { - accessCheck, _ := models.HasAccess(ctx.User, repository, accessMode) + accessCheck, _ := models.HasAccess(ctx.User.ID, repository, accessMode) return accessCheck } @@ -499,7 +499,7 @@ func authenticate(ctx *context.Context, repository *models.Repository, authoriza return false } - accessCheck, _ := models.HasAccess(userModel, repository, accessMode) + accessCheck, _ := models.HasAccess(userModel.ID, repository, accessMode) return accessCheck } -- cgit v1.2.3