altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged [2944] from rjsparks@nostrum.com:

Browse source 
Add a defer/undefer button to the edit_position dialog
 - Legacy-Id: 2951
Note: SVN reference [2944] has been migrated to Git commit 6b997bca0146b9a93967cd319f617a626304e22e
This commit is contained in:
Henrik Levkowetz 2011-03-26 14:31:41 +00:00
parent 2cd7b18ba2
commit c3f3fdb79a
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/idrfc/views_ballot.py
View file

@ -21,6 +21,8 @@ from ietf.ipr.models import IprDetail
from ietf.idrfc.mails import *
from ietf.idrfc.utils import *
from ietf.idrfc.lastcall import request_last_call
from ietf.idrfc.idrfc_wrapper import BallotWrapper
BALLOT_CHOICES = (("yes", "Yes"),
("noobj", "No Objection"),
@ -186,6 +188,7 @@ def edit_position(request, name):
comment=comment,
ad=ad,
return_to_url=return_to_url,
ballot=BallotWrapper(doc.idinternal)
),
context_instance=RequestContext(request))

10
ietf/templates/idrfc/edit_position.html
View file

@ -32,8 +32,18 @@ form.position-form .comment-text {
<h1>Change position for {{ ad }} on {{ doc }}</h1>
<form class="position-form" action="" method="POST">
<div>
<div class="position">{{ form.position }}</div>
{% if ballot.was_deferred %}
<div style="margin-top:8px; margin-bottom:8px;"><span id="doc_undefer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_undefer_ballot name=doc %}">Undefer ballot</a></span></span></div>
<div style="margin-top:8px; margin-bottom:8px;">Ballot deferred by {{ ballot.deferred_by }} on {{ ballot.deferred_date }}.</div>
{% else %}
<div style="margin-top:8px; margin-bottom:8px;"><span id="doc_defer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_defer_ballot name=doc %}">Defer ballot</a></span></span></div>
{% endif %}
</div>
<div style="clear:left"></div>
<div class="discuss-widgets">