From 3baed43600d65edc22a4cac62d380f4eb964a9b9 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 7 Feb 2012 16:33:35 +0000 Subject: [PATCH] Move call for adoption documents from the main group to related documents on the WG page - Legacy-Id: 3905 --- ietf/wginfo/views.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ietf/wginfo/views.py b/ietf/wginfo/views.py index 85fb51835..380b7a00f 100644 --- a/ietf/wginfo/views.py +++ b/ietf/wginfo/views.py @@ -128,7 +128,7 @@ def wg_documents(request, acronym): if not form.is_valid(): raise ValueError("form did not validate") (docs,meta) = search_query(form.cleaned_data) - + # get the related docs form_related = SearchForm({'by':'group', 'name':'-'+str(wg.group_acronym.acronym)+'-', 'activeDrafts':'on'}) if not form_related.is_valid(): @@ -141,7 +141,24 @@ def wg_documents(request, acronym): if ( len(parts) >= 3): if parts[1] != "ietf" and parts[2].startswith(wg.group_acronym.acronym+"-"): docs_related_pruned.append(d) - return wg, concluded, proposed, docs, meta, docs_related_pruned, meta_related + + docs_related = docs_related_pruned + + # move call for WG adoption to related + cleaned_docs = [] + related_doc_names = set(d.id.draft_name for d in docs_related) + for d in docs: + if d.id and d.id._draft and d.id._draft.stream_id == "ietf" and d.id._draft.get_state_slug("draft-stream-ietf") == "c-adopt": + if d.id.draft_name not in related_doc_names: + docs_related.append(d) + else: + cleaned_docs.append(d) + + docs = cleaned_docs + + docs_related.sort(key=lambda d: d.id.draft_name) + + return wg, concluded, proposed, docs, meta, docs_related, meta_related def wg_documents_txt(request, acronym): wg, concluded, proposed, docs, meta, docs_related, meta_related = wg_documents(request, acronym)