Merge branch 'hotfix/v2.82'

rowers/templates/user_boxplot_select.html

@@ -54,7 +54,7 @@
     <input name='daterange' class="button green" type="submit" value="Submit">	</form>
   </div>
 <div class="grid_5 prefix_1 omega">
-  <form id="searchform" action="/rowers/user-boxplot-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+  <form id="searchform" action=""
         method="get" accept-charset="utf-8">
     <div class="grid_3 prefix_1 alpha">
       <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">

rowers/views.py

@@ -2949,6 +2949,14 @@ def user_boxplot_select(request,
     except Rower.DoesNotExist:
         raise Http404("Rower doesn't exist")
     
+    if 'startdate' in request.session:
+        startdate = iso8601.parse_date(request.session['startdate'])
+
+
+    if 'enddate' in request.session:
+        enddate = iso8601.parse_date(request.session['enddate'])
+
+
     if request.method == 'POST':
         dateform = DateRangeForm(request.POST)
         if dateform.is_valid():
@@ -2996,7 +3004,12 @@ def user_boxplot_select(request,
 
     messages.info(request,successmessage)
     messages.error(request,message)
-    
+
+    startdatestring = startdate.strftime('%Y-%m-%d')
+    enddatestring = enddate.strftime('%Y-%m-%d')
+    request.session['startdate'] = startdatestring
+    request.session['enddate'] = enddatestring
+
     return render(request, 'user_boxplot_select.html',
                   {'workouts': workouts,
                    'dateform':dateform,