Skip to content

chom #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qelxiros merged 8 commits into from
Apr 9, 2024
Merged

chom #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c989e9
why is it not working?
Mobmaker55 Apr 9, 2024
f049bc0
"fixed" roles
Mobmaker55 Apr 9, 2024
9783780
prints
Mobmaker55 Apr 9, 2024
a120960
underscore not dash
Mobmaker55 Apr 9, 2024
7c977de
application.py roles
Mobmaker55 Apr 9, 2024
91e461e
teams.py roles
Mobmaker55 Apr 9, 2024
c9d9d5d
no more debugs
Mobmaker55 Apr 9, 2024
bcbd327
fix
Qelxiros Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions selections/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions selections/blueprints/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

Expand Down Expand Up @@ -115,7 +115,7 @@ def import_application():
@auth.oidc_auth
@before_request
def delete_application(app_id, info=None):
is_evals = 'eboard-evaluations' in info['group_list']
is_evals = '/eboard-evaluations' in info['group_list']
is_rtp = 'rtp' in info['group_list']
if is_evals or is_rtp:
scores = Submission.query.filter_by(application=app_id).all()
Expand All @@ -136,7 +136,7 @@ def delete_application(app_id, info=None):
@auth.oidc_auth
@before_request
def get_application_creation(info=None):
is_evals = 'eboard-evaluations' in info['group_list']
is_evals = '/eboard-evaluations' in info['group_list']
is_rtp = 'rtp' in info['group_list']
if is_evals or is_rtp:
return render_template('create.html', info=info)
Expand Down
16 changes: 8 additions & 8 deletions selections/blueprints/teams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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')
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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'
Expand Down