From 6232891462ece7058323697da11487337f871a17 Mon Sep 17 00:00:00 2001 From: Tyler Allen <45888585+Mobmaker55@users.noreply.github.com> Date: Tue, 9 Apr 2024 00:44:10 -0400 Subject: [PATCH 1/3] Fix role issues on Selections (#62) --- selections/__init__.py | 4 ++-- selections/blueprints/application.py | 4 ++-- selections/blueprints/teams.py | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/selections/__init__.py b/selections/__init__.py index 81e84f4..38350cc 100644 --- a/selections/__init__.py +++ b/selections/__init__.py @@ -46,8 +46,8 @@ @auth.oidc_auth @before_request def main(info=None): - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] member = Members.query.filter_by(username=info['uid']).first() all_applications = Applicant.query.all() diff --git a/selections/blueprints/application.py b/selections/blueprints/application.py index 995b2f5..95cba49 100644 --- a/selections/blueprints/application.py +++ b/selections/blueprints/application.py @@ -15,8 +15,8 @@ def get_application(app_id, info=None): applicant_info = Applicant.query.filter_by(id=app_id).first() member = Members.query.filter_by(username=info['uid']).first() - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if not member and not (is_rtp or is_evals): return redirect(url_for('main')) diff --git a/selections/blueprints/teams.py b/selections/blueprints/teams.py index bd58808..1569a0d 100644 --- a/selections/blueprints/teams.py +++ b/selections/blueprints/teams.py @@ -9,8 +9,8 @@ @auth.oidc_auth @before_request def get_teams(info=None): - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if not is_evals and not is_rtp: flash('Not Evals or an RTP') @@ -37,8 +37,8 @@ def get_teams(info=None): @auth.oidc_auth @before_request def create_team(info=None): - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if not is_evals and not is_rtp: flash('Not Evals or an RTP') @@ -72,8 +72,8 @@ def create_team(info=None): @auth.oidc_auth @before_request def add_to_team(team_id, info=None): - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if not is_evals and not is_rtp: flash('Not Evals or an RTP') @@ -105,8 +105,8 @@ def add_to_team(team_id, info=None): @auth.oidc_auth @before_request def remove_from_team(username, info=None): - is_evals = 'eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_evals = '/eboard-evaluations' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if not is_evals and not is_rtp: return 'Not Evals or an RTP' From 54ae06141d1cf30c28c9510f523d079e6c836a05 Mon Sep 17 00:00:00 2001 From: Jeremy Smart Date: Tue, 9 Apr 2024 01:31:21 -0400 Subject: [PATCH 2/3] chom --- selections/blueprints/application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selections/blueprints/application.py b/selections/blueprints/application.py index 2761ae6..6895ba7 100644 --- a/selections/blueprints/application.py +++ b/selections/blueprints/application.py @@ -116,7 +116,7 @@ def import_application(): @before_request def delete_application(app_id, info=None): is_evals = '/eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if is_evals or is_rtp: scores = Submission.query.filter_by(application=app_id).all() applicant_info = Applicant.query.filter_by(id=app_id).first() @@ -137,7 +137,7 @@ def delete_application(app_id, info=None): @before_request def get_application_creation(info=None): is_evals = '/eboard-evaluations' in info['group_list'] - is_rtp = 'rtp' in info['group_list'] + is_rtp = '/active_rtp' in info['group_list'] if is_evals or is_rtp: return render_template('create.html', info=info) else: From e973206bd343f4e09fdcbb1f11b3bf58ec8eeedd Mon Sep 17 00:00:00 2001 From: Tyler Allen <45888585+Mobmaker55@users.noreply.github.com> Date: Tue, 9 Apr 2024 11:47:34 -0400 Subject: [PATCH 3/3] all the roles are right now (#64)