diff options
author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-10-06 15:43:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-06 15:43:28 +0800 |
commit | 2eaf1d693ae08c0312dd1f977f81675f418f3770 (patch) | |
tree | b42a26180e813918a05a676bd18e13a3a1bb73ec /internal/route/api | |
parent | a92d818aa35583594a6b3098f4e1e1f4edec17dd (diff) |
db: migrate access table to use GORM (#6371)
Diffstat (limited to 'internal/route/api')
-rw-r--r-- | internal/route/api/v1/api.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/internal/route/api/v1/api.go b/internal/route/api/v1/api.go index 993ce8a3..13de45b2 100644 --- a/internal/route/api/v1/api.go +++ b/internal/route/api/v1/api.go @@ -45,11 +45,11 @@ func repoAssignment() macaron.Handler { } c.Repo.Owner = owner - r, err := db.GetRepositoryByName(owner.ID, reponame) + repo, err := db.Repos.GetByName(owner.ID, reponame) if err != nil { c.NotFoundOrError(err, "get repository by name") return - } else if err = r.GetOwner(); err != nil { + } else if err = repo.GetOwner(); err != nil { c.Error(err, "get owner") return } @@ -57,12 +57,12 @@ func repoAssignment() macaron.Handler { if c.IsTokenAuth && c.User.IsAdmin { c.Repo.AccessMode = db.AccessModeOwner } else { - mode, err := db.UserAccessMode(c.UserID(), r) - if err != nil { - c.Error(err, "get user access mode") - return - } - c.Repo.AccessMode = mode + c.Repo.AccessMode = db.Perms.AccessMode(c.UserID(), repo.ID, + db.AccessModeOptions{ + OwnerID: repo.OwnerID, + Private: repo.IsPrivate, + }, + ) } if !c.Repo.HasAccess() { @@ -70,7 +70,7 @@ func repoAssignment() macaron.Handler { return } - c.Repo.Repository = r + c.Repo.Repository = repo } } |