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

fix: correct stream document view (#6677)

Browse source 
* fix: correct stream document view

* fix: better filtering for stream view
This commit is contained in:
Robert Sparks 2023-11-21 12:33:36 -06:00 committed by GitHub
parent ab3864e07a
commit b760248cc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ietf/doc/utils_search.py
View file

@ -103,7 +103,6 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
if d.type_id == "draft": if d.type_id == "draft":
state_slug = d.get_state_slug() state_slug = d.get_state_slug()
if state_slug == "rfc": if state_slug == "rfc":
log.unreachable("2023-11-15")
d.search_heading = "RFC" d.search_heading = "RFC"
d.expirable = False d.expirable = False
elif state_slug in ("ietf-rm", "auth-rm"): elif state_slug in ("ietf-rm", "auth-rm"):

5
ietf/group/views.py
View file

@ -1276,7 +1276,10 @@ def stream_documents(request, acronym):
editable = has_role(request.user, "Secretariat") or group.has_role(request.user, "chair") editable = has_role(request.user, "Secretariat") or group.has_role(request.user, "chair")
stream = StreamName.objects.get(slug=acronym) stream = StreamName.objects.get(slug=acronym)
qs = Document.objects.filter(states__type="draft", states__slug__in=["active", "rfc"], stream=acronym) qs = Document.objects.filter(stream=acronym).filter(
Q(type_id="draft", states__type="draft", states__slug="active")
| Q(type_id="rfc")
)
docs, meta = prepare_document_table(request, qs, max_results=1000) docs, meta = prepare_document_table(request, qs, max_results=1000)
return render(request, 'group/stream_documents.html', {'stream':stream, 'docs':docs, 'meta':meta, 'editable':editable } ) return render(request, 'group/stream_documents.html', {'stream':stream, 'docs':docs, 'meta':meta, 'editable':editable } )