From c9f94415acb50a3e59087e50bb792c5b102f2ed4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 6 Sep 2022 08:45:27 +0200 Subject: [PATCH] small fixes coach trial --- rowers/teams.py | 2 +- rowers/views/userviews.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rowers/teams.py b/rowers/teams.py index 7a663031..94f3307b 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -325,7 +325,7 @@ def create_coaching_offer(coach, user): while code in codes: # pragma: no cover code = uuid.uuid4().hex[:10].upper() - if 'coach' in coach.rowerplan and get_coach_club_size(coach) < coach.clubsize: + if is_coach(coach.user) and get_coach_club_size(coach) < coach.clubsize: rekwest = CoachOffer(coach=coach, user=user, code=code) rekwest.save() diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index 50574afb..e2a56af3 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -1,6 +1,6 @@ from rowers.views.statements import * - +from rowers.rower_rules import user_is_not_basic @login_required() def deactivate_user(request): @@ -377,6 +377,7 @@ def rower_exportsettings_view(request, userid=0): 'nk_auto_import': 'nktoken' } r = getrequestrowercoachee(request, userid=userid) + print(r,r.nk_auto_import,'aap') if request.method == 'POST': form = RowerExportForm(request.POST) if form.is_valid(): @@ -395,7 +396,7 @@ def rower_exportsettings_view(request, userid=0): doset = False except KeyError: doset = True - if r.rowerplan == 'basic': # pragma: no cover + if not user_is_not_basic(r.user): # pragma: no cover doset = False if not doset: before = getattr(r, attr) @@ -404,7 +405,7 @@ def rower_exportsettings_view(request, userid=0): if doset: setattr(r, attr, value) else: - if r.rowerplan != 'basic': + if user_is_not_basic(r.user): messages.error( request, 'Could not set '+attr+'. You need to create the connection first.')