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

Merge branch 'hotfix/v5.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-26 19:15:07 +01:00
parent c2fc846530 33af6176a3
commit dcd4ddc705
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rowers/views.py
View File

@@ -2646,9 +2646,21 @@ def cum_flex(request,theuser=0,
if 'options' in request.session: if 'options' in request.session:
options = request.session['options'] options = request.session['options']
workouttypes = options['workouttypes'] try:
includereststrokes = options['includereststrokes'] workouttypes = options['workouttypes']
waterboattype = options['waterboattype'] except KeyError:
workouttypes = ['rower','dynamic','slides']
try:
includereststrokes = options['includereststrokes']
except KeyError:
includereststrokes = False
try:
waterboattype = options['waterboattype']
except KeyError:
waterboattype = ['1x','2x','2-','4x','4-','8+']
workstrokesonly = not includereststrokes workstrokesonly = not includereststrokes
@@ -6501,9 +6513,19 @@ def cumstats(request,theuser=0,
if 'options' in request.session: if 'options' in request.session:
options = request.session['options'] options = request.session['options']
workouttypes = options['workouttypes'] try:
includereststrokes = options['includereststrokes'] workouttypes = options['workouttypes']
except KeyError:
workouttypes = ['rower','dynamic','slides']
try:
includereststrokes = options['includereststrokes']
except KeyError:
includereststrokes = False
workstrokesonly = not includereststrokes workstrokesonly = not includereststrokes
checktypes = ['water','rower','dynamic','slides','skierg', checktypes = ['water','rower','dynamic','slides','skierg',
'paddle','snow','other','coastal'] 'paddle','snow','other','coastal']
waterboattype = ['1x','2x','2-','4x','4-','8+'] waterboattype = ['1x','2x','2-','4x','4-','8+']