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

Merged [4909] from rjsparks@nostrum.com:

Browse source 
Reimplemented clear_ballot to close the existing ballot and create a new one. Changed the all_positions code to only return synthetic no-positions for current ADs when a ballot is actually open
 - Legacy-Id: 4962
Note: SVN reference [4909] has been migrated to Git commit 2e6caa21b1
This commit is contained in:
Henrik Levkowetz 2012-10-30 12:07:10 +00:00
parent 9d042badf2 2e6caa21b1
commit 5eeb670b28
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ietf/doc/models.py
View file

@ -567,14 +567,16 @@ class BallotDocEvent(DocEvent):
latest.old_positions.append(e.pos)
# add any missing ADs through fake No Record events
norecord = BallotPositionName.objects.get(slug="norecord")
for ad in active_ads:
if ad not in seen:
e = BallotPositionDocEvent(type="changed_ballot_position", doc=self.doc, ad=ad)
e.pos = norecord
e.old_ad = False
e.old_positions = []
positions.append(e)
if self.doc.active_ballot() == self:
norecord = BallotPositionName.objects.get(slug="norecord")
for ad in active_ads:
if ad not in seen:
e = BallotPositionDocEvent(type="changed_ballot_position", doc=self.doc, ad=ad)
e.by = ad
e.pos = norecord
e.old_ad = False
e.old_positions = []
positions.append(e)
positions.sort(key=lambda p: (p.old_ad, p.ad.last_name()))
return positions

2
ietf/idrfc/views_doc.py
View file

@ -296,7 +296,7 @@ def document_ballot_content(request, doc, ballot_id, editable=True):
deferred = doc.active_defer_event()
positions = doc.active_ballot().all_positions() if doc.active_ballot() else ballot.all_positions()
positions = ballot.all_positions()
# put into position groups
position_groups = []