From 43fe4d87fa843544da553b02e271d237a92806cf Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Wed, 7 Dec 2011 19:17:05 +0000
Subject: [PATCH] Fix use of email_address() in nomcom view  - Legacy-Id: 3749

---
 ietf/announcements/views.py                      | 2 +-
 ietf/templates/announcements/nomcomREDESIGN.html | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ietf/announcements/views.py b/ietf/announcements/views.py
index e8a1cc9e3..739588892 100644
--- a/ietf/announcements/views.py
+++ b/ietf/announcements/views.py
@@ -52,7 +52,7 @@ def nomcomREDESIGN(request):
         e = n.latest_event(type="concluded")
         n.end_year = e.time.year if e else ""
 
-        chair = n.role_set.get(name="chair").person
+        chair = n.role_set.select_related().get(name="chair")
         announcements = Message.objects.filter(related_groups=n).order_by('-time')
         for a in announcements:
             a.to_name = address_re.sub("", a.to)
diff --git a/ietf/templates/announcements/nomcomREDESIGN.html b/ietf/templates/announcements/nomcomREDESIGN.html
index 2a7bf4fb7..fb32bdb3c 100644
--- a/ietf/templates/announcements/nomcomREDESIGN.html
+++ b/ietf/templates/announcements/nomcomREDESIGN.html
@@ -5,12 +5,14 @@
 
 <h1>IAB/IESG Nominating Committee</h1>
 
-<h3>Current Committee Chair: <a href="mailto:{{ curr_chair.email_address }}">{{ curr_chair.name }}</a></h3>
+<h3>Current Committee Chair: <a href="mailto:{{ curr_chair.email.address }}">{{ curr_chair.person.name }}</a></h3>
 
 {% for regime in regimes %}
   <hr>
   <h1>Messages from {{ regime.group.start_year }} - {{ regime.group.end_year }}</h1>
-  <h4>Committee Chair: <a href="mailto:{{ regime.chair.email_address }}">{{ regime.chair.name }}</a></h4>
+
+  {# use person email address here rather than the generic nomcom-chair@ietf.org #}
+  <h4>Committee Chair: <a href="mailto:{{ regime.chair.person.email_address }}">{{ regime.chair.person.name }}</a></h4>
   <table class="ietf-table">
     <tr>
       <th width="10%">Date</th>