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

Merge branch 'release/v14.74'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-03 19:48:18 +01:00
parent 64acc464c3 3b5615f29b
commit 1c48a60dbc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tests/test_urls.py
View File

@@ -11,7 +11,7 @@ nu = datetime.datetime.now()
tested = [ tested = [
'/rowers/me/delete/', '/rowers/me/delete/',
'/rowers/performancemanager/' # '/rowers/performancemanager/'
] ]

8
rowers/views/analysisviews.py
View File

@@ -1543,7 +1543,7 @@ def fitnessmetric_view(request,userid=0,mode='rower',
@user_passes_test(ispromember, login_url="/rowers/paidplans", @user_passes_test(ispromember, login_url="/rowers/paidplans",
message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality", message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
redirect_field_name=None) redirect_field_name=None)
@permission_required('rower.is_promember',fn=get_user_by_userid,raise_exception=True) @permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
def performancemanager_view(request,userid=0,mode='rower', def performancemanager_view(request,userid=0,mode='rower',
startdate=timezone.now()-timezone.timedelta(days=365), startdate=timezone.now()-timezone.timedelta(days=365),
enddate=timezone.now()): enddate=timezone.now()):
@@ -1552,6 +1552,7 @@ def performancemanager_view(request,userid=0,mode='rower',
if request.is_ajax(): if request.is_ajax():
is_ajax = True is_ajax = True
therower = getrequestrower(request,userid=userid) therower = getrequestrower(request,userid=userid)
theuser = therower.user theuser = therower.user
@@ -1576,7 +1577,10 @@ def performancemanager_view(request,userid=0,mode='rower',
therower.showfatigue = dofatigue therower.showfatigue = dofatigue
therower.save() therower.save()
else: else:
form = PerformanceManagerForm() form = PerformanceManagerForm(initial={
'doform':doform,
'dofatigue':dofatigue,
})
script, thediv, endfitness, endfatigue, endform = performance_chart( script, thediv, endfitness, endfatigue, endform = performance_chart(
theuser,startdate=startdate,enddate=enddate, theuser,startdate=startdate,enddate=enddate,