fix: add missing deleted_at columns to all plugin tables, fix system-settings response schema, fix transaction rollback in permissions
This commit is contained in:
+11
-3
@@ -105,9 +105,17 @@ async def resolve_permissions(
|
||||
}
|
||||
"""
|
||||
# Check system admin first
|
||||
user_q = select(User.is_system_admin).where(User.id == user_id)
|
||||
user_result = await db.execute(user_q)
|
||||
is_system_admin = user_result.scalar() or False
|
||||
# If a previous query in this session failed, the transaction may be aborted.
|
||||
# Rollback to recover before executing our query.
|
||||
try:
|
||||
user_q = select(User.is_system_admin).where(User.id == user_id)
|
||||
user_result = await db.execute(user_q)
|
||||
is_system_admin = user_result.scalar() or False
|
||||
except Exception:
|
||||
await db.rollback()
|
||||
user_q = select(User.is_system_admin).where(User.id == user_id)
|
||||
user_result = await db.execute(user_q)
|
||||
is_system_admin = user_result.scalar() or False
|
||||
|
||||
if is_system_admin:
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user