Skip to content

Commit 87489c8

Browse files
committed
Merged in [18856] from rjsparks@nostrum.com:
Patch around multiple newrevisiondocevents. - Legacy-Id: 18868 Note: SVN reference [18856] has been migrated to Git commit 160030c
2 parents 8bf32fc + 160030c commit 87489c8

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

ietf/doc/views_doc.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -891,11 +891,19 @@ def document_bibxml(request, name, rev=None):
891891
if rev and rev != doc.rev:
892892
raise Http404("Revision not found")
893893

894-
try:
895-
doc_event = NewRevisionDocEvent.objects.get(doc__name=doc.name, rev=(rev or latest_rev))
894+
### PATCH to deal with unexpected multiple NewRevisionDocEvent objects for the same revision on a document
895+
doc_event_qs = NewRevisionDocEvent.objects.filter(doc__name=doc.name, rev=(rev or latest_rev))
896+
if doc_event_qs.count():
897+
doc_event = doc_event_qs.order_by('time').last()
896898
doc.date = doc_event.time.date()
897-
except DocEvent.DoesNotExist:
899+
else:
898900
doc.date = doc.time.date() # Even if this may be incoreect, what would be better?
901+
902+
# try:
903+
# doc_event = NewRevisionDocEvent.objects.get(doc__name=doc.name, rev=(rev or latest_rev))
904+
# doc.date = doc_event.time.date()
905+
# except DocEvent.DoesNotExist:
906+
# doc.date = doc.time.date() # Even if this may be incoreect, what would be better?
899907

900908
return render(request, "doc/bibxml.xml",
901909
dict(

0 commit comments

Comments
 (0)