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

Merge tag 'v7.16' into develop

Browse Source 
hotfix
This commit is contained in:
Sander Roosendaal
2018-07-06 16:35:01 +02:00
parent 45bf58673e 85be903eb8
commit b1537bad88
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/views.py
View File

@@ -885,7 +885,7 @@ def hasplannedsessions(user):
result = user.is_authenticated() and (r.rowerplan=='coach' or r.rowerplan=='plan') result = user.is_authenticated() and (r.rowerplan=='coach' or r.rowerplan=='plan')
if not result and r.plantrialexpires: if not result and r.plantrialexpires:
result = user.is_authenticaded() and r.rowerplan=='basic' and r.plantrialexpires >= datetime.date.today() result = user.is_authenticated() and r.rowerplan=='basic' and r.plantrialexpires >= datetime.date.today()
else: else:
result = False result = False
@@ -10690,7 +10690,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
work = int(normw) work = int(normw)
power = int(normp) power = int(normp)
pace_secs = int(500./normv) try:
pace_secs = int(500./normv)
except (OverflowError, ZeroDivisionError):
pace_secs = 140.
try: try:
avpace = datetime.timedelta(seconds=int(500./normv)) avpace = datetime.timedelta(seconds=int(500./normv))