Merge branch 'release/v14.74'

rowers/tests/test_urls.py

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

rowers/views/analysisviews.py

@@ -1543,7 +1543,7 @@ def fitnessmetric_view(request,userid=0,mode='rower',
 @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",
                   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',
                             startdate=timezone.now()-timezone.timedelta(days=365),
                             enddate=timezone.now()):
@@ -1552,6 +1552,7 @@ def performancemanager_view(request,userid=0,mode='rower',
     if request.is_ajax():
         is_ajax = True
 
+
     therower = getrequestrower(request,userid=userid)
     theuser = therower.user
 
@@ -1576,7 +1577,10 @@ def performancemanager_view(request,userid=0,mode='rower',
             therower.showfatigue = dofatigue
             therower.save()
     else:
-        form = PerformanceManagerForm()
+        form = PerformanceManagerForm(initial={
+            'doform':doform,
+            'dofatigue':dofatigue,
+            })
 
     script, thediv, endfitness, endfatigue, endform = performance_chart(
         theuser,startdate=startdate,enddate=enddate,