Private
Public Access
1
0

Merge branch 'hotfix/v8.30'

This commit is contained in:
Sander Roosendaal
2018-10-28 20:03:25 +01:00
2 changed files with 6 additions and 4 deletions

View File

@@ -100,7 +100,8 @@
</form>
</li>
<li class="grid_2">
<form id="searchform" action=""
<form id="searchform"
action=""
method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
<button class="button blue small" type="submit">
@@ -110,7 +111,9 @@
</li>
<li class="grid_2 maxheight">
{% if workouts %}
<form enctype="multipart/form-data" action="">
<form enctype="multipart/form-data"
action="/rowers/multi-compare"
method="post">
<input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
@@ -130,7 +133,7 @@
</table>
</p>
<p>
<input name="chartform" class="button green" type="submit" value="Submit">
<input name="chartform" class="button green" type="submit" value="Compare">
</p>
</form>
</li>

View File

@@ -5464,7 +5464,6 @@ def multi_compare_view(request,id=0):
if result:
promember=1
if request.method == 'POST' and 'workouts' in request.POST:
form = WorkoutMultipleCompareForm(request.POST)
chartform = ChartParamChoiceForm(request.POST)