From 4afcb973c10ec21fcc6e6264d093e50dd88d4bc5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 19 Jul 2012 13:59:33 +0000 Subject: [PATCH] Fix 1wg-charters.txt (and friend) to not list the areas as if they were WGs. - Legacy-Id: 4618 --- ietf/templates/wginfo/1wg-charters-by-acronym.txt | 8 ++++---- ietf/templates/wginfo/1wg-charters.txt | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ietf/templates/wginfo/1wg-charters-by-acronym.txt b/ietf/templates/wginfo/1wg-charters-by-acronym.txt index 1081f7660..247e1466c 100644 --- a/ietf/templates/wginfo/1wg-charters-by-acronym.txt +++ b/ietf/templates/wginfo/1wg-charters-by-acronym.txt @@ -1,4 +1,4 @@ -{% load ietf_filters %}{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% ifequal wg.area.area.status_id 1 %}{% if wg.start_date %}{{ wg }} -{% endif %}{% endifequal %}{% endfor %} -{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% ifequal wg.area.area.status_id 1 %}{% if wg.start_date %}{% include "wginfo/wg-charter.txt" %} -{% endif %}{% endifequal %}{% endfor %} +{% load ietf_filters %}{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{{ wg }} +{% endif %}{% endif %}{% endfor %} +{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{% include "wginfo/wg-charter.txt" %} +{% endif %}{% endif %}{% endfor %} diff --git a/ietf/templates/wginfo/1wg-charters.txt b/ietf/templates/wginfo/1wg-charters.txt index 959b2c6e9..4e5e70941 100644 --- a/ietf/templates/wginfo/1wg-charters.txt +++ b/ietf/templates/wginfo/1wg-charters.txt @@ -1,5 +1,7 @@ -{% load ietf_filters %}{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% ifequal wg.area.area.status_id 1 %}{% if wg.start_date %}{{ wg }} -{% endif %}{% endifequal %}{% endfor %}{% endfor %} -{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% ifequal wg.area.area.status_id 1 %}{% if wg.start_date %} +{% load ietf_filters %}{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{{ wg }} +{% endif %}{% endif %}{% endfor %}{% endfor %} + +{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %} {% include "wginfo/wg-charter.txt" %} -{% endif %}{% endifequal %}{% endfor %}{% endfor %} +{% endif %}{% endif %}{% endfor %}{% endfor %} +