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

Merged in [9428] from rjsparks@nostrum.com:

Browse source 
Properly mark (and test) older ballot comment and discuss text after a new revision is submitted . Fixes bug #1656.
 - Legacy-Id: 9434
Note: SVN reference [9428] has been migrated to Git commit 0ff9747092
This commit is contained in:
Henrik Levkowetz 2015-04-09 21:00:07 +00:00
parent 422869611b 0ff9747092
commit c417c5720a
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/doc/models.py
View file

@ -701,7 +701,7 @@ class DocEvent(models.Model):
desc = models.TextField()
def for_current_revision(self):
return self.time >= self.doc.time
return self.time >= self.doc.latest_event(NewRevisionDocEvent,type='new_revision').time
def get_dochistory(self):
return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time').first()

14
ietf/doc/tests.py
View file

@ -14,7 +14,8 @@ from django.core.urlresolvers import reverse as urlreverse
from django.conf import settings
from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, save_document_in_history )
DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, NewRevisionDocEvent,
save_document_in_history )
from ietf.group.models import Group
from ietf.meeting.models import Meeting, Session, SessionPresentation
from ietf.name.models import SessionStatusName
@ -520,6 +521,7 @@ class DocTestCase(TestCase):
r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
self.assertEqual(r.status_code, 200)
self.assertTrue(pos.comment in r.content)
self.assertTrue(pos.comment_time.strftime('(%Y-%m-%d)') in r.content)
# test with ballot_id
r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot.pk)))
@ -529,6 +531,16 @@ class DocTestCase(TestCase):
# test popup too while we're at it
r = self.client.get(urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)))
self.assertEqual(r.status_code, 200)
# Now simulate a new revision and make sure positions on older revisions are marked as such
oldrev = doc.rev
e = NewRevisionDocEvent.objects.create(doc=doc,rev='%02d'%(int(doc.rev)+1),type='new_revision',by=Person.objects.get(name="(System)"))
save_document_in_history(doc)
doc.rev = e.rev
doc.save()
r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
self.assertEqual(r.status_code, 200)
self.assertTrue( '(%s for -%s)' % (pos.comment_time.strftime('%Y-%m-%d'),oldrev) in r.content)
def test_document_ballot_needed_positions(self):
make_test_data()