Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switched from reserve to standby and added support in UI review detail

Browse source
This commit is contained in:
James Tauber 2012-09-02 15:04:17 -04:00
parent 0422855582
commit 8f5291b539
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
symposion/reviews/models.py
View file

@ -213,7 +213,7 @@ class ProposalResult(models.Model):
("accepted", "accepted"), ("accepted", "accepted"),
("rejected", "rejected"), ("rejected", "rejected"),
("undecided", "undecided"), ("undecided", "undecided"),
("in-reserve", "in reserve"), ("standby", "standby"),
], default="undecided") ], default="undecided")
@classmethod @classmethod

4
symposion/reviews/views.py
View file

@ -225,8 +225,8 @@ def review_detail(request, pk):
elif result == "undecide": elif result == "undecide":
proposal.result.status = "undecided" proposal.result.status = "undecided"
proposal.result.save() proposal.result.save()
elif result == "reserve": elif result == "standby":
proposal.result.status = "in-reserve" proposal.result.status = "standby"
proposal.result.save() proposal.result.save()
return redirect(request.path) return redirect(request.path)

26
symposion/templates/reviews/review_detail.html
View file

@ -21,25 +21,37 @@
<form class="result-form form-inline" method="POST" action=""> <form class="result-form form-inline" method="POST" action="">
{% csrf_token %} {% csrf_token %}
<div class="btn-group"> <div class="btn-group">
{% if proposal.result.get_accepted_display == "accepted" %} {% if proposal.result.status == "accepted" %}
<a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a> <a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
<li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li> <li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li>
<li><input type="submit" name="result_submit" value="standby" class="btn" /></li>
<li><input type="submit" name="result_submit" value="undecide" class="btn" /></li> <li><input type="submit" name="result_submit" value="undecide" class="btn" /></li>
</ul> </ul>
{% else %} {% else %}
{% if proposal.result.get_accepted_display == "rejected" %} {% if proposal.result.status == "rejected" %}
<a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a> <a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
<li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li> <li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li>
<li><input type="submit" name="result_submit" value="standby" class="btn" /></li>
<li><input type="submit" name="result_submit" value="undecide" class="btn" /></li> <li><input type="submit" name="result_submit" value="undecide" class="btn" /></li>
</ul> </ul>
{% else %} {% else %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a> {% if proposal.result.status == "standby" %}
<ul class="dropdown-menu pull-right"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a>
<li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li> <ul class="dropdown-menu pull-right">
<li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li> <li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li>
</ul> <li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li>
<li><input type="submit" name="result_submit" value="undecide" class="btn" /></li>
</ul>
{% else %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li>
<li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li>
<li><input type="submit" name="result_submit" value="standby" class="btn" /></li>
</ul>
{% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>