From 0665cae5c47243e87bd9e40585b67c4dc5e0dae3 Mon Sep 17 00:00:00 2001 From: Joe Abbate Date: Sun, 25 Sep 2022 01:07:29 -0400 Subject: [PATCH] Black Linting --- proxstar/__init__.py | 18 ++++++++++++++---- proxstar/models.py | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/proxstar/__init__.py b/proxstar/__init__.py index 9269ef6..bf46ac6 100644 --- a/proxstar/__init__.py +++ b/proxstar/__init__.py @@ -46,7 +46,7 @@ from proxstar.db import ( set_template_info, add_shared_pool, get_shared_pool, - get_shared_pools + get_shared_pools, ) from proxstar.vnc import ( add_vnc_target, @@ -228,8 +228,17 @@ def list_pools(): user.rtp = False proxmox = connect_proxmox() user_pools = get_pool_cache(db) if user.rtp else [] - shared_pools = map(lambda pool: {"name": pool.name, "members": pool.members, "vms": proxmox.pools(pool.name).get()['members']}, get_shared_pools(db, user.name, user.rtp)) - return render_template('list_pools.html', user=user, user_pools=user_pools, shared_pools=shared_pools) + shared_pools = map( + lambda pool: { + "name": pool.name, + "members": pool.members, + "vms": proxmox.pools(pool.name).get()['members'], + }, + get_shared_pools(db, user.name, user.rtp), + ) + return render_template( + 'list_pools.html', user=user, user_pools=user_pools, shared_pools=shared_pools + ) @app.route('/isos') @@ -607,12 +616,13 @@ def ignored_pools(pool): else: return '', 403 + @app.route('/pool/shared/create', methods=['GET', 'POST']) @auth.oidc_auth def create_shared_pool(): user = User(session['userinfo']['preferred_username']) if request.method == 'GET': - return render_template('create_pool.html',user=user) + return render_template('create_pool.html', user=user) elif request.method == 'POST': name = request.form['name'] members = request.form['members'].split(';') diff --git a/proxstar/models.py b/proxstar/models.py index 030bffe..47ecc4f 100644 --- a/proxstar/models.py +++ b/proxstar/models.py @@ -55,6 +55,7 @@ class Allowed_Users(Base): __tablename__ = 'allowed_users' id = Column(String(32), primary_key=True) + @default_repr class Shared_Pools(Base): __tablename__ = 'shared_pools'