sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

small fixes coach trial

Browse Source
This commit is contained in:
Sander Roosendaal
2022-09-06 08:45:27 +02:00
parent c541ea0562
commit c9f94415ac
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/teams.py
View File

@@ -325,7 +325,7 @@ def create_coaching_offer(coach, user):
while code in codes: # pragma: no cover while code in codes: # pragma: no cover
code = uuid.uuid4().hex[:10].upper() 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 = CoachOffer(coach=coach, user=user, code=code)
rekwest.save() rekwest.save()

7
rowers/views/userviews.py
View File

@@ -1,6 +1,6 @@
from rowers.views.statements import * from rowers.views.statements import *
from rowers.rower_rules import user_is_not_basic
@login_required() @login_required()
def deactivate_user(request): def deactivate_user(request):
@@ -377,6 +377,7 @@ def rower_exportsettings_view(request, userid=0):
'nk_auto_import': 'nktoken' 'nk_auto_import': 'nktoken'
} }
r = getrequestrowercoachee(request, userid=userid) r = getrequestrowercoachee(request, userid=userid)
print(r,r.nk_auto_import,'aap')
if request.method == 'POST': if request.method == 'POST':
form = RowerExportForm(request.POST) form = RowerExportForm(request.POST)
if form.is_valid(): if form.is_valid():
@@ -395,7 +396,7 @@ def rower_exportsettings_view(request, userid=0):
doset = False doset = False
except KeyError: except KeyError:
doset = True doset = True
if r.rowerplan == 'basic': # pragma: no cover if not user_is_not_basic(r.user): # pragma: no cover
doset = False doset = False
if not doset: if not doset:
before = getattr(r, attr) before = getattr(r, attr)
@@ -404,7 +405,7 @@ def rower_exportsettings_view(request, userid=0):
if doset: if doset:
setattr(r, attr, value) setattr(r, attr, value)
else: else:
if r.rowerplan != 'basic': if user_is_not_basic(r.user):
messages.error( messages.error(
request, 'Could not set '+attr+'. You need to create the connection first.') request, 'Could not set '+attr+'. You need to create the connection first.')