Apply fix to missing nomcom chair in [4384] instead of [4385].

- Legacy-Id: 4389
Note: SVN reference [4385] has been migrated to Git commit c3ad0b53e4

ietf/announcements/views.py

@@ -4,7 +4,6 @@ from django.views.generic.simple import direct_to_template
 from django.shortcuts import get_object_or_404
 from django.conf import settings
 from django.db.models import Q
-from django.core.exceptions import ObjectDoesNotExist
 
 import re
 
@@ -52,18 +51,17 @@ def nomcomREDESIGN(request):
         e = GroupEvent.objects.filter(group=n, type="changed_state", changestategroupevent__state="conclude").order_by('time')[:1]
         n.end_year = e[0].time.year if e else ""
 
-        # A nomcom chair may not exist even if the nomcom NN group has been created:
+        r = n.role_set.select_related().filter(name="chair") 
-        try:
+        chair = None 
-            chair = n.role_set.select_related().get(name="chair")
+        if r: 
-            announcements = Message.objects.filter(related_groups=n).order_by('-time')
+            chair = r[0] 
-            for a in announcements:
+        announcements = Message.objects.filter(related_groups=n).order_by('-time')
-                a.to_name = address_re.sub("", a.to)
+        for a in announcements:
+            a.to_name = address_re.sub("", a.to)
 
-            regimes.append(dict(chair=chair,
+        regimes.append(dict(chair=chair,
-                                announcements=announcements,
+                            announcements=announcements,
-                                group=n))
+                            group=n))
-        except ObjectDoesNotExist:
-            pass
 
     regimes.sort(key=lambda x: x["group"].start_year, reverse=True)