fix: remove iab executive director specialization from the liaison app (ietf-tools#9435)

Author: rjsparks

ietf/liaisons/forms.py

@@ -105,7 +105,6 @@ def internal_groups_for_person(person: Optional[Person]):
             "Secretariat",
             "IETF Chair",
             "IAB Chair",
-            "IAB Executive Director",
             "Liaison Manager",
             "Liaison Coordinator",
             "Authorized Individual",
@@ -115,7 +114,7 @@ def internal_groups_for_person(person: Optional[Person]):
     # Interesting roles, as Group queries
     queries = [
         Q(role__person=person, role__name="chair", acronym="ietf"),
-        Q(role__person=person, role__name__in=("chair", "execdir"), acronym="iab"),
+        Q(role__person=person, role__name="chair", acronym="iab"),
         Q(role__person=person, role__name="ad", type="area", state="active"),
         Q(
             role__person=person,

ietf/liaisons/tests.py

@@ -123,7 +123,6 @@ def test_get_cc(self):
         cc = get_cc(Group.objects.get(acronym='iab'))
         self.assertTrue(EMAIL_ALIASES['IAB'] in cc)
         self.assertTrue(EMAIL_ALIASES['IABCHAIR'] in cc)
-        self.assertTrue(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'] in cc)
         # test an Area
         area = Group.objects.filter(type='area').first()
         cc = get_cc(area)
@@ -166,7 +165,6 @@ def test_get_contacts_for_group(self):
         # test iab
         contacts = get_contacts_for_group(Group.objects.get(acronym='iab'))
         self.assertTrue(EMAIL_ALIASES['IABCHAIR'] in contacts)
-        self.assertTrue(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'] in contacts)
         # test iesg
         contacts = get_contacts_for_group(Group.objects.get(acronym='iesg'))
         self.assertTrue(EMAIL_ALIASES['IESG'] in contacts)
@@ -534,7 +532,6 @@ def test_outgoing_access(self):
         RoleFactory(name_id='liaison_coordinator', group__acronym='iab', person__user__username='liaison-coordinator')
         mars = RoleFactory(name_id='chair',person__user__username='marschairman',group__acronym='mars').group
         RoleFactory(name_id='secr',group=mars,person__user__username='mars-secr')
-        RoleFactory(name_id='execdir',group=Group.objects.get(acronym='iab'),person__user__username='iab-execdir')
 
         url = urlreverse('ietf.liaisons.views.liaison_list')
         addurl = urlreverse('ietf.liaisons.views.liaison_add', kwargs={'type':'outgoing'})
@@ -592,15 +589,6 @@ def test_outgoing_access(self):
         r = self.client.get(addurl)
         self.assertEqual(r.status_code, 200)
 
-        # IAB Executive Director
-        self.assertTrue(self.client.login(username="iab-execdir", password="iab-execdir+password"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q("a.btn:contains('New outgoing liaison')")), 1)
-        r = self.client.get(addurl)
-        self.assertEqual(r.status_code, 200)
-
         # Liaison Manager has access
         self.assertTrue(self.client.login(username="ulm-liaiman", password="ulm-liaiman+password"))
         r = self.client.get(url)

ietf/liaisons/tests_forms.py

@@ -94,11 +94,6 @@ def test_all_internal_groups(self):
     def test_internal_groups_for_person(self):
         # test relies on the data created in ietf.utils.test_data.make_immutable_test_data()
         # todo add liaison coordinator when modeled
-        RoleFactory(
-            name_id="execdir",
-            group=Group.objects.get(acronym="iab"),
-            person__user__username="iab-execdir",
-        )
         RoleFactory(
             name_id="auth",
             group__type_id="sdo",
@@ -121,7 +116,6 @@ def test_internal_groups_for_person(self):
             "secretary",
             "ietf-chair",
             "iab-chair",
-            "iab-execdir",
             "sdo-authperson",
         ):
             returned_queryset = internal_groups_for_person(
@@ -151,11 +145,6 @@ def test_internal_groups_for_person(self):
         )
 
     def test_external_groups_for_person(self):
-        RoleFactory(
-            name_id="execdir",
-            group=Group.objects.get(acronym="iab"),
-            person__user__username="iab-execdir",
-        )
         RoleFactory(name_id="liaison_coordinator", group__acronym="iab", person__user__username="liaison-coordinator")
         the_sdo = GroupFactory(type_id="sdo", acronym="the-sdo")
         liaison_manager = RoleFactory(name_id="liaiman", group=the_sdo).person
@@ -166,7 +155,6 @@ def test_external_groups_for_person(self):
             "secretary",
             "ietf-chair",
             "iab-chair",
-            "iab-execdir",
             "liaison-coordinator",
             "ad",
             "sopschairman",

ietf/liaisons/utils.py

@@ -8,7 +8,6 @@
 OUTGOING_LIAISON_ROLES = [
     "Area Director",
     "IAB Chair",
-    "IAB Executive Director",
     "IETF Chair",
     "Liaison Manager",
     "Liaison Coordinator",

ietf/liaisons/views.py

@@ -30,11 +30,12 @@
 from ietf.utils.response import permission_denied
 
 EMAIL_ALIASES = {
-    'IETFCHAIR':'The IETF Chair <chair@ietf.org>',
-    'IESG':'The IESG <iesg@ietf.org>',
-    'IAB':'The IAB <iab@iab.org>',
-    'IABCHAIR':'The IAB Chair <iab-chair@iab.org>',
-    'IABEXECUTIVEDIRECTOR':'The IAB Executive Director <execd@iab.org>'}
+    "IETFCHAIR": "The IETF Chair <chair@ietf.org>",
+    "IESG": "The IESG <iesg@ietf.org>",
+    "IAB": "The IAB <iab@iab.org>",
+    "IABCHAIR": "The IAB Chair <iab-chair@iab.org>",
+}
+
 
 # -------------------------------------------------
 # Helper Functions
@@ -84,8 +85,6 @@ def _find_person_in_emails(liaison, person):
             return True
         elif addr in ('iab@iab.org', 'iab-chair@iab.org') and has_role(person.user, "IAB Chair"):
             return True
-        elif addr in ('execd@iab.org', ) and has_role(person.user, "IAB Executive Director"):
-            return True
 
     return False
 
@@ -110,7 +109,6 @@ def get_cc(group):
     elif group.acronym in ('iab'):
         emails.append(EMAIL_ALIASES['IAB'])
         emails.append(EMAIL_ALIASES['IABCHAIR'])
-        emails.append(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'])
     elif group.type_id == 'area':
         emails.append(EMAIL_ALIASES['IETFCHAIR'])
         ad_roles = group.role_set.filter(name='ad')
@@ -151,7 +149,6 @@ def get_contacts_for_group(group):
         contacts.append(EMAIL_ALIASES['IETFCHAIR'])
     elif group.acronym == 'iab':
         contacts.append(EMAIL_ALIASES['IABCHAIR'])
-        contacts.append(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'])
     elif group.acronym == 'iesg':
         contacts.append(EMAIL_ALIASES['IESG'])
 
@@ -171,7 +168,7 @@ def needs_approval(group,person):
     user = person.user
     if group.acronym in ('ietf','iesg') and has_role(user, 'IETF Chair'):
         return False
-    if group.acronym == 'iab' and (has_role(user,'IAB Chair') or has_role(user,'IAB Executive Director')):
+    if group.acronym == 'iab' and has_role(user,'IAB Chair'):
         return False
     if group.type_id == 'area' and group.role_set.filter(name='ad',person=person):
         return False