Skip to content

fix: search correct doc type/states, switch rfc correctly in html_body, remove dead code. #6640

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 2 commits into from
Nov 16, 2023
Merged

fix: search correct doc type/states, switch rfc correctly in html_body, remove dead code. #6640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1f30e
fix: search correct doc type/states, switch rfc correctly in html_bod…
rjsparks Nov 14, 2023
05e5903
chore: Add unreachable() marker
jennifer-richards Nov 15, 2023
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
2 changes: 1 addition & 1 deletion ietf/doc/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def text_or_error(self):
return self.text() or "Error; cannot read '%s'"%self.get_base_name()

def html_body(self, classes=""):
if self.get_state_slug() == "rfc":
if self.type_id == "rfc":
try:
html = Path(
os.path.join(settings.RFC_PATH, self.name + ".html")
Expand Down
10 changes: 0 additions & 10 deletions ietf/doc/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,6 @@ def augment_events_with_revision(doc, events):
qs = NewRevisionDocEvent.objects.filter(doc=doc)
event_revisions = list(qs.order_by('time', 'id').values('id', 'rev', 'time'))

if doc.type_id == "draft" and doc.get_state_slug() == "rfc":
# add fake "RFC" revision
if isinstance(events, QuerySetAny):
e = events.filter(type="published_rfc").order_by('time').last()
else:
e = doc.latest_event(type="published_rfc")
if e:
event_revisions.append(dict(id=e.id, time=e.time, rev="RFC"))
event_revisions.sort(key=lambda x: (x["time"], x["id"]))

for e in sorted(events, key=lambda e: (e.time, e.id), reverse=True):
while event_revisions and (e.time, e.id) < (event_revisions[-1]["time"], event_revisions[-1]["id"]):
event_revisions.pop()
Expand Down
4 changes: 3 additions & 1 deletion ietf/doc/utils_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from ietf.doc.utils import augment_docs_and_user_with_user_info
from ietf.meeting.models import SessionPresentation, Meeting, Session
from ietf.review.utils import review_assignments_to_list_for_docs
from ietf.utils import log
from ietf.utils.timezone import date_today


Expand Down Expand Up @@ -102,6 +103,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
if d.type_id == "draft":
state_slug = d.get_state_slug()
if state_slug == "rfc":
log.unreachable("2023-11-15")
d.search_heading = "RFC"
d.expirable = False
elif state_slug in ("ietf-rm", "auth-rm"):
Expand All @@ -117,7 +119,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
d.search_heading = "%s" % (d.type,)
d.expirable = False

if d.get_state_slug() != "rfc":
if d.type_id == "draft" and d.get_state_slug() != "rfc":
d.milestones = [ m for (t, s, v, m) in sorted(((m.time, m.state.slug, m.desc, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
d.review_assignments = review_assignments_to_list_for_docs([d]).get(d.name, [])

Expand Down