From 2eaf1d693ae08c0312dd1f977f81675f418f3770 Mon Sep 17 00:00:00 2001
From: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Date: Tue, 6 Oct 2020 15:43:28 +0800
Subject: db: migrate access table to use GORM (#6371)
---
internal/cmd/serv.go | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'internal/cmd/serv.go')
diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go
index 06d78a6d..aa7ee1bf 100644
--- a/internal/cmd/serv.go
+++ b/internal/cmd/serv.go
@@ -210,11 +210,12 @@ func runServ(c *cli.Context) error {
fail("Internal error", "Failed to get user by key ID '%d': %v", key.ID, err)
}
- mode, err := db.UserAccessMode(user.ID, repo)
- if err != nil {
- fail("Internal error", "Failed to check access: %v", err)
- }
-
+ mode := db.Perms.AccessMode(user.ID, repo.ID,
+ db.AccessModeOptions{
+ OwnerID: repo.OwnerID,
+ Private: repo.IsPrivate,
+ },
+ )
if mode < requestMode {
clientMessage := _ACCESS_DENIED_MESSAGE
if mode >= db.AccessModeRead {
--
cgit v1.2.3