big ole refactor
This commit is contained in:
@@ -39,12 +39,12 @@ func (c *Checker) LoadPermissionsMiddleware() hws.Middleware {
|
||||
|
||||
var roles_ []*db.Role
|
||||
var perms []*db.Permission
|
||||
if err := db.WithTxFailSilently(r.Context(), c.conn, func(ctx context.Context, tx bun.Tx) error {
|
||||
if err := c.conn.WithTxFailSilently(r.Context(), func(ctx context.Context, tx bun.Tx) error {
|
||||
var err error
|
||||
|
||||
if previewRole != nil {
|
||||
// In preview mode: use the preview role instead of user's roles
|
||||
role, err := db.GetRoleWithPermissions(ctx, tx, previewRole.ID)
|
||||
role, err := db.GetRoleByID(ctx, tx, previewRole.ID)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "db.GetRoleWithPermissions")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user