Skip to content

Commit fbd3157

Browse files
committed
Summary: Fix a subtle event ordering problem that sometimes show up
when running the test suite with MySql - Legacy-Id: 10189
1 parent 32a4a95 commit fbd3157

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

ietf/doc/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,10 +684,11 @@ class DocEvent(models.Model):
684684
desc = models.TextField()
685685

686686
def for_current_revision(self):
687-
return self.time >= self.doc.latest_event(NewRevisionDocEvent,type='new_revision').time
687+
e = self.doc.latest_event(NewRevisionDocEvent,type='new_revision')
688+
return not e or (self.time, self.pk) >= (e.time, e.pk)
688689

689690
def get_dochistory(self):
690-
return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time').first()
691+
return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time', '-pk').first()
691692

692693
def __unicode__(self):
693694
return u"%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time)

0 commit comments

Comments
 (0)