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

Merge branch 'hotfix/v6.89'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-12 20:04:14 +02:00
parent cab5216354 eab60762b6
commit 06d098c589
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rowers/views.py
View File

@@ -2981,21 +2981,38 @@ def cum_flex_data(
'deltadays':-1, 'deltadays':-1,
}): }):
def_options = options
if 'options' in request.session: if 'options' in request.session:
options = request.session['options'] options = request.session['options']
workouttypes = options['workouttypes'] try:
rankingonly = options['rankingonly'] workouttypes = options['workouttypes']
includereststrokes = options['includereststrokes'] rankingonly = options['rankingonly']
waterboattype = options['waterboattype'] includereststrokes = options['includereststrokes']
workstrokesonly = not includereststrokes waterboattype = options['waterboattype']
theuser = options['theuser'] workstrokesonly = not includereststrokes
xparam = options['xparam'] theuser = options['theuser']
yparam1 = options['yparam1'] xparam = options['xparam']
yparam2 = options['yparam2'] yparam1 = options['yparam1']
startdatestring = options['startdatestring'] yparam2 = options['yparam2']
enddatestring = options['enddatestring'] startdatestring = options['startdatestring']
deltadays = options['deltadays'] enddatestring = options['enddatestring']
deltadays = options['deltadays']
except KeyError:
workouttypes = def_options['workouttypes']
rankingonly = def_options['rankingonly']
includereststrokes = def_options['includereststrokes']
waterboattype = def_options['waterboattype']
workstrokesonly = not includereststrokes
theuser = def_options['theuser']
xparam = def_options['xparam']
yparam1 = def_options['yparam1']
yparam2 = def_options['yparam2']
startdatestring = def_options['startdatestring']
enddatestring = def_options['enddatestring']
deltadays = def_options['deltadays']
try: try:
@@ -3047,7 +3064,7 @@ def cum_flex_data(
yparam2=yparam2, yparam2=yparam2,
promember=promember, promember=promember,
workstrokesonly=workstrokesonly, workstrokesonly=workstrokesonly,
rankingpiece__in=rankingpiece) )
script = res[0] script = res[0]
div = res[1] div = res[1]
else: else:
@@ -3629,7 +3646,7 @@ def addmanual_view(request):
try: try:
rankingpiece = form.cleaned_data['rankingpiece'] rankingpiece = form.cleaned_data['rankingpiece']
except KeyError: except KeyError:
rankingpiece =- Workout.objects.get(id=id).rankingpiece rankingpiece = False
if private: if private:
privacy = 'private' privacy = 'private'