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

Fix terminology confusion and say "send ballot" rather than "issue

Browse source 
ballot" to clear up that it is not actually created.
 - Legacy-Id: 4362
This commit is contained in:
Ole Laursen 2012-05-03 17:02:55 +00:00
parent b6a057673a
commit cb634216b5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/templates/wgcharter/ballot_writeupnotes.html
View file

@ -22,7 +22,7 @@ form #id_ballot_writeup {
<div class="actions">
<a href="{% url doc_writeup name=charter.name %}">Back</a>
<input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
<input style="margin-left: 8px" type="submit" name="issue_ballot" value="Save and {% if reissue %}Re-{% endif %}Issue Ballot" />
<input style="margin-left: 8px" type="submit" name="send_ballot" value="Save and {% if reissue %}Re-{% endif %}Send Ballot to the IESG" />
</div>
</form>

6
ietf/wgcharter/views.py
View file

@ -403,7 +403,7 @@ def ballot_writeupnotes(request, name):
form = BallotWriteupForm(initial=dict(ballot_writeup=existing.text))
if request.method == 'POST' and ("save_ballot_writeup" in request.POST or "issue_ballot" in request.POST):
if request.method == 'POST' and ("save_ballot_writeup" in request.POST or "send_ballot" in request.POST):
form = BallotWriteupForm(request.POST)
if form.is_valid():
t = form.cleaned_data["ballot_writeup"]
@ -415,7 +415,7 @@ def ballot_writeupnotes(request, name):
e.text = t
e.save()
if "issue_ballot" in request.POST and approval:
if "send_ballot" in request.POST and approval:
if has_role(request.user, "Area Director") and not charter.latest_event(BallotPositionDocEvent, type="changed_ballot_position", ad=login, ballot=ballot):
# sending the ballot counts as a yes
pos = BallotPositionDocEvent(doc=charter, by=login)
@ -431,7 +431,7 @@ def ballot_writeupnotes(request, name):
e = DocEvent(doc=charter, by=login)
e.by = login
e.type = "sent_ballot_announcement"
e.desc = "Ballot has been issued"
e.desc = "Ballot has been sent"
e.save()
return render_to_response('wgcharter/ballot_issued.html',