From 1145751a9b64c5ea320e96639cb9ba95eeb4aca6 Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Fri, 9 Oct 2015 17:55:12 +0000
Subject: [PATCH] Improve secretariat rolodex roles section, sort and identify
 concluded groups.  Commit ready for merge.  - Legacy-Id: 10159

---
 ietf/secr/rolodex/views.py            |  4 +++-
 ietf/secr/templates/rolodex/view.html | 12 ++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py
index 82849e3ee..0778a5815 100644
--- a/ietf/secr/rolodex/views.py
+++ b/ietf/secr/rolodex/views.py
@@ -274,9 +274,11 @@ def view(request, id):
     
     # must filter for active emails only
     person.emails = person.email_set.filter(active=True)
+    roles = person.role_set.all().order_by('name__name','group__acronym')
     
     return render_to_response('rolodex/view.html', {
-        'person': person},
+        'person': person,
+        'roles': roles},
         RequestContext(request, {}),
     )
 
diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html
index 8b1898f64..e27bde6bb 100644
--- a/ietf/secr/templates/rolodex/view.html
+++ b/ietf/secr/templates/rolodex/view.html
@@ -39,18 +39,14 @@
           </tr>
         </thead>
         <tbody>
-          {% for role in person.role_set.all %}
+          {% for role in roles %}
             <tr>
                 <td>{{ role.name }} </td>
                 <td>
-                  {% if role.group.type.slug == "wg" %}
-                    <a href="{% url "groups_view" acronym=role.group.acronym %}">{{ role.group.acronym }}</a>
+                  {% if role.group.type.slug == "area" %}
+                      <a href="{% url "areas_view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
                   {% else %}
-                    {% if role.group.type.slug == "area" %}
-                      <a href="{% url "areas_view" name=role.group.acronym %}">{{ role.group.acronym }}</a>
-                    {% else %}
-                      {{ role.group }}
-                    {% endif %}
+                    <a href="{% url "groups_view" acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
                   {% endif %}
                 </td>
                 <td>{{ role.email }}</td>