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

fix: restore rfcs on document graph when looking at rfc predecesors (#6646)

Browse source
This commit is contained in:
Robert Sparks 2023-11-16 10:49:50 -06:00 committed by GitHub
parent a035c93351
commit 9fedce005f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
ietf/doc/utils.py
View file

@ -957,49 +957,62 @@ def make_rev_history(doc):
def get_predecessors(doc, predecessors=None):
if predecessors is None:
predecessors = []
predecessors = set()
if hasattr(doc, 'relateddocument_set'):
for document in doc.related_that_doc('replaces'):
if document not in predecessors:
predecessors.append(document)
predecessors.extend(get_predecessors(document, predecessors))
predecessors.add(document)
predecessors.update(get_predecessors(document, predecessors))
if doc.came_from_draft():
predecessors.append(doc.came_from_draft())
predecessors.add(doc.came_from_draft())
predecessors.update(get_predecessors(doc.came_from_draft(), predecessors))
return predecessors
def get_ancestors(doc, ancestors = None):
if ancestors is None:
ancestors = []
ancestors = set()
if hasattr(doc, 'relateddocument_set'):
for document in doc.related_that('replaces'):
if document not in ancestors:
ancestors.append(document)
ancestors.extend(get_ancestors(document, ancestors))
ancestors.add(document)
ancestors.update(get_ancestors(document, ancestors))
if doc.became_rfc():
ancestors.append(doc.became_rfc())
if doc.became_rfc() not in ancestors:
ancestors.add(doc.became_rfc())
ancestors.update(get_ancestors(doc.became_rfc(), ancestors))
return ancestors
def get_replaces_tree(doc):
tree = get_predecessors(doc)
tree.extend(get_ancestors(doc))
tree.update(get_ancestors(doc))
return tree
history = {}
docs = get_replaces_tree(doc)
if docs is not None:
docs.append(doc)
docs.add(doc)
for d in docs:
for e in d.docevent_set.filter(type='new_revision').distinct():
if hasattr(e, 'newrevisiondocevent'):
url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
history[url] = {
'name': d.name,
'rev': e.newrevisiondocevent.rev,
'published': e.time.isoformat(),
'url': url,
}
if d.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
history[url]['pages'] = d.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
if d.type_id == "rfc":
url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d))
e = d.docevent_set.filter(type="published_rfc").order_by("-time").first()
history[url] = {
"name": d.name,
"rev": d.name,
"published": e and e.time.isoformat(),
"url": url,
}
else:
for e in d.docevent_set.filter(type='new_revision').distinct():
if hasattr(e, 'newrevisiondocevent'):
url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
history[url] = {
'name': d.name,
'rev': e.newrevisiondocevent.rev,
'published': e.time.isoformat(),
'url': url,
}
if d.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
history[url]['pages'] = d.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
if doc.type_id == "draft":
# Do nothing - all draft revisions are captured above already.