Skip to content

Commit

Permalink
Saving motions should redirect to draw; change draw page toolbar slig…
Browse files Browse the repository at this point in the history
…htly

Signed-off-by: Philip Belesky <[email protected]>
  • Loading branch information
philipbelesky committed Apr 3, 2016
1 parent 75d18e0 commit e6b2dbe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions draw/templates/draw_confirmed.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
<a href="{% round_url draw_matchups_edit round %}" class="btn btn-default submit-disable">
Edit Matchups
</a>
<a class="btn btn-default submit-disable" href="{% round_url draw_with_standings %}">
Draw Details
</a>
{% if pref.allocation_confirmations %}
<a href="{% round_url confirmations_view %}" class="btn btn-default submit-disable">
Shift Confirms
Expand All @@ -44,7 +41,7 @@
{% endif %}
{% if not pref.enable_debate_scheduling %}
<button class="btn {% if round.starts_at %}btn-success{% else %}btn-primary{% endif %} submit-disable" data-toggle="modal" data-target="#start-time-form">
{% if round.starts_at %}Start Time: {{ round.starts_at }}{% else %}Add Start Time{% endif %}
{% if round.starts_at %}Starts at {{ round.starts_at }}{% else %}Add Start Time{% endif %}
</button>
{% else %}
<a href="{% round_url schedule_debates %}" class="btn btn-default submit-disable">
Expand Down Expand Up @@ -136,7 +133,7 @@
</a>
</div>

<div class="btn-group pull-right">
<div class="btn-group">
<a target="_blank" class="btn btn-sm btn-default" href="{% round_url draw_print_scoresheets round %}">
<span class="text-primary">
Print Ballots <span class="glyphicon glyphicon-share"></span>
Expand All @@ -155,6 +152,13 @@
</a>
{% endif %}
</div>

<div class="btn-group pull-right">
<a class="btn btn-sm btn-default submit-disable" href="{% round_url draw_with_standings %}">
View Draw Details
</a>
</div>

</div>

<div class="panel-body">
Expand Down
2 changes: 1 addition & 1 deletion motions/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def motions_edit(request, round):
for motions in formset.deleted_objects:
motions.delete()
if 'submit' in request.POST:
return redirect_round('motions', round)
return redirect_round('draw', round)
else:
formset = MotionFormSet(queryset=Motion.objects.filter(round=round))

Expand Down

0 comments on commit e6b2dbe

Please sign in to comment.