This commit is contained in:
Joe Abbate 2022-09-25 01:11:42 -04:00
parent b39ec59dcd
commit 1fc875fa7d
No known key found for this signature in database
GPG key ID: 7F1CC23828058430
2 changed files with 5 additions and 5 deletions

View file

@ -230,9 +230,9 @@ def list_pools():
user_pools = get_pool_cache(db) if user.rtp else [] user_pools = get_pool_cache(db) if user.rtp else []
shared_pools = map( shared_pools = map(
lambda pool: { lambda pool: {
"name": pool.name, 'name': pool.name,
"members": pool.members, 'members': pool.members,
"vms": proxmox.pools(pool.name).get()['members'], 'vms': proxmox.pools(pool.name).get()['members'],
}, },
get_shared_pools(db, user.name, user.rtp), get_shared_pools(db, user.name, user.rtp),
) )

View file

@ -217,7 +217,7 @@ def set_template_info(db, template_id, name, disk):
def add_shared_pool(db, name, members): def add_shared_pool(db, name, members):
if db.query(Shared_Pools).get(name): if db.query(Shared_Pools).get(name):
return "Name Already in Use" return 'Name Already in Use'
db.add(Shared_Pools(name=name, members=members)) db.add(Shared_Pools(name=name, members=members))
db.commit() db.commit()
@ -230,6 +230,6 @@ def get_shared_pools(db, user, all_pools):
if all_pools: if all_pools:
return db.query(Shared_Pools).all() return db.query(Shared_Pools).all()
pools = [] pools = []
for pool in db.query(Shared_Pools).filter(Shared_Pools.members.contains(f"{{{user}}}")).all(): for pool in db.query(Shared_Pools).filter(Shared_Pools.members.contains(f'{{{user}}}')).all():
pools.append(pool) pools.append(pool)
return pools return pools