Blacked all files
This commit is contained in:
1 parent
37910b71be
commit
7463846282
45 files changed
+711
-205
No files matched your search
@@ -83,9 +83,16 @@ async def show_list(
|
||||
clients = []
|
||||
for item in list_:
|
||||
last_login = (
|
||||
db.query(LoginHistory).filter(LoginHistory.client_id == item.id).order_by(desc(LoginHistory.date)).first()
|
||||
db.query(LoginHistory)
|
||||
.filter(LoginHistory.client_id == item.id)
|
||||
.order_by(desc(LoginHistory.date))
|
||||
.first()
|
||||
)
|
||||
last_login = (
|
||||
"Never"
|
||||
if last_login is None
|
||||
else last_login.date.strftime("%d-%b-%Y %H:%M")
|
||||
)
|
||||
last_login = "Never" if last_login is None else last_login.date.strftime("%d-%b-%Y %H:%M")
|
||||
clients.append(
|
||||
{
|
||||
"id": item.id,
|
||||
|
||||
@@ -78,7 +78,9 @@ def add_permissions(role: Role, permissions: List[schemas.PermissionItem], db):
|
||||
gp = [p for p in role.permissions if p.id == permission.id_]
|
||||
gp = None if len(gp) == 0 else gp[0]
|
||||
if permission.enabled and gp is None:
|
||||
role.permissions.append(db.query(Permission).filter(Permission.id == permission.id_).one())
|
||||
role.permissions.append(
|
||||
db.query(Permission).filter(Permission.id == permission.id_).one()
|
||||
)
|
||||
elif not permission.enabled and gp:
|
||||
role.permissions.remove(gp)
|
||||
|
||||
@@ -123,7 +125,9 @@ async def show_list(
|
||||
{
|
||||
"id": item.id,
|
||||
"name": item.name,
|
||||
"permissions": [p.name for p in sorted(item.permissions, key=lambda p: p.name)],
|
||||
"permissions": [
|
||||
p.name for p in sorted(item.permissions, key=lambda p: p.name)
|
||||
],
|
||||
}
|
||||
for item in db.query(Role).order_by(Role.name).all()
|
||||
]
|
||||
|
||||
@@ -170,8 +170,13 @@ async def show_list(
|
||||
|
||||
|
||||
@router.get("/active")
|
||||
async def show_active(db: Session = Depends(get_db), user: UserToken = Depends(get_user)):
|
||||
return [{"name": item.name} for item in db.query(User).filter(User.locked_out == False).order_by(User.name)]
|
||||
async def show_active(
|
||||
db: Session = Depends(get_db), user: UserToken = Depends(get_user)
|
||||
):
|
||||
return [
|
||||
{"name": item.name}
|
||||
for item in db.query(User).filter(User.locked_out == False).order_by(User.name)
|
||||
]
|
||||
|
||||
|
||||
@router.get("/{id_}", response_model=schemas.User)
|
||||
@@ -189,7 +194,10 @@ def user_info(item: Optional[User], db: Session, user: UserToken):
|
||||
return {
|
||||
"name": "",
|
||||
"lockedOut": False,
|
||||
"roles": [{"id": r.id, "name": r.name, "enabled": False} for r in db.query(Role).order_by(Role.name).all()],
|
||||
"roles": [
|
||||
{"id": r.id, "name": r.name, "enabled": False}
|
||||
for r in db.query(Role).order_by(Role.name).all()
|
||||
],
|
||||
}
|
||||
else:
|
||||
return {
|
||||
|
||||
Reference in new issue
Block a user