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

Merge branch 'hotfix/v8.30'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-28 20:03:25 +01:00
parent d1d119da37 c5dbc01f8d
commit 5541457637
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/templates/team_compare_select.html
View File

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

1
rowers/views.py
View File

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