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

Merge branch 'develop' into feature/cp2

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-11 20:34:15 +02:00
parent e0f11a3c1f ea5c99ad57
commit 4668527a2d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views/analysisviews.py
View File

@@ -780,7 +780,11 @@ def analysis_view_data(request,userid=0):
elif function == 'compare': elif function == 'compare':
script,div = comparisondata(workouts,options) script,div = comparisondata(workouts,options)
elif function == 'cp': elif function == 'cp':
<<<<<<< HEAD
script, div = cpdata(workouts, options) script, div = cpdata(workouts, options)
=======
script, div = cpdata(workouts,options)
>>>>>>> develop
else: else:
script = '' script = ''
div = 'Unknown analysis functions' div = 'Unknown analysis functions'

7
rowers/views/workoutviews.py
View File

@@ -4701,9 +4701,10 @@ def workout_upload_api(request):
if post_data['useremail'] in rwr.emailalternatives: if post_data['useremail'] in rwr.emailalternatives:
r = rwr r = rwr
break break
if post_data['useremail'] not in r.emailalternatives: if r is not None and r.emailalternatives is not None:
message = {'status':'false','message':'could not find user'} if post_data['useremail'] not in r.emailalternatives:
return JSONResponse(status=400,data=message) message = {'status':'false','message':'could not find user'}
return JSONResponse(status=400,data=message)
if r is None: if r is None: