Merge branch 'release/v3.36'

2017-07-06 13:41:59 +02:00
parent 8c7ba0a561 19d3f47230
commit 952210756d
1 changed files with 10 additions and 2 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3424,9 +3424,17 @@ def multiflex_view(request,userid=0,

    if 'options' in request.session:
        options = request.session['options']
+
+    try:
+        includereststrokes = options['includereststrokes']
+    except KeyError:
+        includereststrokes = False
+
+    try:
+        ploterrorbars = options['ploterrorbars']
+    except KeyError:
+        ploterrorbars = False
        
-    includereststrokes = options['includereststrokes']
-    ploterrorbars = options['ploterrorbars']
    workstrokesonly = not includereststrokes

    if userid==0: