From caa3ec98b4cee014c065b94f648a765f45b473ad Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 1 Aug 2018 18:53:44 +0000
Subject: [PATCH] Changed the menu listing of review dirs and their display on
 the Directorates page back to what it was before the 'reviews' group type was
 split out.  Added a 'Reviews' column to the Directoratges page.  - Legacy-Id:
 15420

---
 ietf/doc/templatetags/active_groups_menu.py | 2 +-
 ietf/group/views.py                         | 2 +-
 ietf/templates/group/active_dirs.html       | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py
index 6bf50f850..3a566091a 100644
--- a/ietf/doc/templatetags/active_groups_menu.py
+++ b/ietf/doc/templatetags/active_groups_menu.py
@@ -7,7 +7,7 @@ register = template.Library()
 
 @register.simple_tag
 def active_groups_menu():
-    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','review','program'])
+    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
     for p in parents:
         p.menu_url = '/%s/'%p.slug
     return render_to_string('base/menu_active_groups.html', { 'parents': parents })
diff --git a/ietf/group/views.py b/ietf/group/views.py
index d73cc94c6..082b0e0a2 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -305,7 +305,7 @@ def active_group_types(request):
     return render(request, 'group/active_groups.html', {'grouptypes':grouptypes})
 
 def active_dirs(request):
-    dirs = Group.objects.filter(type="dir", state="active").order_by("name")
+    dirs = Group.objects.filter(type__in=['dir', 'review'], state="active").order_by("name")
     for group in dirs:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
         group.ads = sorted(roles(group, "ad"), key=extract_last_name)
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index 96b728b83..044a3636e 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -17,6 +17,7 @@
       <tr>
         <th>Team</th>
         <th>Name</th>
+        <th>Reviews</th>
         <th>Area</th>
         <th>AD</th>
         <th>Secretaries</th>
@@ -28,6 +29,11 @@
         <tr>
           <td><a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
           <td>{{ group.name }}</td>
+	  <td class="text-center">
+	    {% if group.type_id == 'review' %}
+	      <span class="fa fa-check tiny"><span class="hidden">yes</span></span>
+	    {% endif %}
+	  </td>
           <td><a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
           <td>
             {% for ad in group.ads %}