Skip to content

fix: handle names with endings that might parse as versions better #4897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 7 commits into from
Dec 20, 2022
Merged

fix: handle names with endings that might parse as versions better #4897

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a36f7d6
fix: Use the doc name matched by fuzzy_find_documents when rendering
larseggert Dec 9, 2022
ac87d98
Merge remote-tracking branch 'origin/main' into fix-4855
larseggert Dec 12, 2022
7574741
Follow suggestion by @rjsparks
larseggert Dec 12, 2022
c9a1477
Merge branch 'main' into fix-4855
larseggert Dec 13, 2022
4efa1d9
Merge branch 'main' into fix-4855
larseggert Dec 14, 2022
be62a32
fix: handle names with endings that might parse as versions better
rjsparks Dec 14, 2022
528ed15
Merge branch 'main' into alternative-fix-4855
rjsparks Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ietf/doc/views_doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,22 +810,20 @@ def document_html(request, name, rev=None):
if num_found > 1:
raise Http404("Multiple documents matched: %s" % name)

if found.matched_name.startswith('rfc') and name != found.matched_name:
return redirect('ietf.doc.views_doc.document_html', name=found.matched_name)

doc = found.documents.get()
rev = found.matched_rev

if doc.is_rfc() and rev is None:
if not name.startswith('rfc'):
return redirect('ietf.doc.views_doc.document_html', name=doc.canonical_name())

if found.matched_rev or found.matched_name.startswith('rfc'):
rev = found.matched_rev
else:
rev = doc.rev
if rev:
doc = doc.history_set.filter(rev=rev).first() or doc.fake_history_obj(rev)

if not os.path.exists(doc.get_file_name()):
raise Http404("File not found: %s" % doc.get_file_name())

return document_main(request, name, rev=rev, document_html=True)
return document_main(request, name=doc.name, rev=doc.rev if not doc.is_rfc() else None, document_html=True)

def document_pdfized(request, name, rev=None, ext=None):

Expand Down