Convert IRTF area groups into their own group type rather than attempting to overload AG. Fixes ietf-tools#3027. Commit ready for merge.

 - Legacy-Id: 18298

Author: rjsparks

ietf/bin/list-role-holder-emails

@@ -24,7 +24,7 @@ from ietf.group.models import Role
 addresses = set()
 for role in Role.objects.filter(
                     group__state__slug='active',
-                    group__type__in=['ag','area','dir','iab','ietf','irtf','nomcom','rg','team','wg',]):
+                    group__type__in=['ag','area','dir','iab','ietf','irtf','nomcom','rg','team','wg','rag']):
     #sys.stderr.write(str(role)+'\n')
     for e in role.person.email_set.all():
         if e.active and not e.address.startswith('unknown-email-'):

ietf/community/forms.py

@@ -45,7 +45,7 @@ def restrict_state(state_type, slug=None):
                 self.fields["group"].label = "Area"
                 self.fields["group"].queryset = self.fields["group"].queryset.filter(Q(type="area") | Q(acronym="irtf")).order_by("acronym")
             else:
-                self.fields["group"].queryset = self.fields["group"].queryset.filter(type__in=("wg", "rg", "ag", )).order_by("acronym")
+                self.fields["group"].queryset = self.fields["group"].queryset.filter(type__in=("wg", "rg", "ag", "rag", "program" )).order_by("acronym")
 
             del self.fields["person"]
             del self.fields["text"]

ietf/community/utils.py

@@ -51,7 +51,7 @@ def can_manage_community_list(user, clist):
         if has_role(user, 'Secretariat'):
             return True
 
-        if clist.group.type_id in ['area', 'wg', 'rg', 'ag', 'program', ]:
+        if clist.group.type_id in ['area', 'wg', 'rg', 'ag', 'rag', 'program', ]:
             return Role.objects.filter(name__slug__in=clist.group.features.groupman_roles, person__user=user, group=clist.group).exists()
 
     return False

ietf/doc/mails.py

@@ -246,7 +246,7 @@ def generate_approval_mail_approved(request, doc):
 
     # the second check catches some area working groups (like
     # Transport Area Working Group)
-    if doc.group.type_id not in ("area", "individ", "ag", "rg") and not doc.group.name.endswith("Working Group"):
+    if doc.group.type_id not in ("area", "individ", "ag", "rg", "rag") and not doc.group.name.endswith("Working Group"):
         doc.group.name_with_wg = doc.group.name + " Working Group"
     else:
         doc.group.name_with_wg = doc.group.name

ietf/doc/templatetags/active_groups_menu.py

@@ -7,7 +7,7 @@
 
 register = template.Library()
 
-parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+parents = GroupTypeName.objects.filter(slug__in=['ag','area','rag','team','dir','program'])
 
 others = []
 for group in Group.objects.filter(acronym__in=('rsoc',), state_id='active'):

ietf/doc/utils.py

@@ -121,7 +121,7 @@ def can_adopt_draft(user, doc):
                 and doc.group.type_id == "individ")
 
     roles = Role.objects.filter(name__in=("chair", "delegate", "secr"),
-                                group__type__in=("wg", "rg", "ag", ),
+                                group__type__in=("wg", "rg", "ag", "rag"),
                                 group__state="active",
                                 person__user=user)
     role_groups = [ r.group for r in roles ]

ietf/group/factories.py

@@ -22,7 +22,7 @@ class Meta:
     def parent(self):
         if self.type_id in ['wg','ag']:
             return GroupFactory(type_id='area')
-        elif self.type_id in ['rg']:
+        elif self.type_id in ['rg','rag']:
             return GroupFactory(acronym='irtf', type_id='irtf')
         else:
             return None

ietf/group/tests_info.py

@@ -71,7 +71,7 @@ def test_active_groups(self):
         self.assertContains(r, group.name)
         self.assertContains(r, group.ad_role().person.plain_name())
 
-        for t in ('rg','area','ag','dir','review','team','program'):
+        for t in ('rg','area','ag', 'rag', 'dir','review','team','program'):
             g = GroupFactory.create(type_id=t,state_id='active') 
             if t in ['dir','review']:
                 g.parent = GroupFactory.create(type_id='area',state_id='active')
@@ -87,7 +87,7 @@ def test_active_groups(self):
         self.assertContains(r, "Directorate")
         self.assertContains(r, "AG")
 
-        for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','area','dir','review','team','program','adhoc','ise']).values_list('slug',flat=True):
+        for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','rag','area','dir','review','team','program','adhoc','ise']).values_list('slug',flat=True):
             with self.assertRaises(NoReverseMatch):
                 url=urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type=slug))
 
@@ -265,6 +265,7 @@ def test_group_about(self):
             'wg'   : ['secretary','ad'],
             'rg'   : ['secretary','irtf-chair'],
             'ag'   : ['secretary', 'ad' ],
+            'rag'  : ['secretary', 'irtf-chair'],
             'team' : ['secretary',], # The code currently doesn't let ads edit teams or directorates. Maybe it should.
             'dir'  : ['secretary',],
             'review'  : ['secretary',],
@@ -279,7 +280,7 @@ def setup_role(group, role_id):
 
         test_groups = []
 
-        for t in ['wg','rg','ag','team']:
+        for t in ['wg','rg','ag','rag','team']:
             g = GroupFactory(type_id=t)
             setup_role(g,'chair')
             test_groups.append(g)
@@ -1472,7 +1473,7 @@ def ensure_cant_edit(group,user):
             self.assertEqual(response.status_code, 404)
             self.client.logout()
 
-        for type_id in GroupTypeName.objects.exclude(slug__in=('wg','rg','ag','team')).values_list('slug',flat=True):
+        for type_id in GroupTypeName.objects.exclude(slug__in=('wg','rg','ag','rag','team')).values_list('slug',flat=True):
             group = GroupFactory.create(type_id=type_id)
             for user in (None,User.objects.get(username='secretary')):
                 ensure_updates_dont_show(group,user)

ietf/group/utils.py

@@ -216,7 +216,7 @@ def construct_group_menu_context(request, group, selected, group_type, others):
         entries.append(("Review requests", urlreverse(ietf.group.views.review_requests, kwargs=kwargs)))
         entries.append(("Reviewers", urlreverse(ietf.group.views.reviewer_overview, kwargs=kwargs)))
 
-    if group.features.has_meetings:     # type_id in ('rg','wg','ag','team'):
+    if group.features.has_meetings:
         entries.append(("Meetings", urlreverse("ietf.group.views.meetings", kwargs=kwargs)))
     entries.append(("History", urlreverse("ietf.group.views.history", kwargs=kwargs)))
     entries.append(("Photos", urlreverse("ietf.group.views.group_photos", kwargs=kwargs)))

ietf/group/views.py

@@ -289,6 +289,8 @@ def active_groups(request, group_type=None):
         return active_rgs(request)
     elif group_type == "ag":
         return active_ags(request)
+    elif group_type == "rag":
+        return active_rags(request)
     elif group_type == "area":
         return active_areas(request)
     elif group_type == "team":
@@ -303,7 +305,7 @@ def active_groups(request, group_type=None):
         raise Http404
 
 def active_group_types(request):
-    grouptypes = GroupTypeName.objects.filter(slug__in=['wg','rg','ag','team','dir','review','area','program']).filter(group__state='active').annotate(group_count=Count('group'))
+    grouptypes = GroupTypeName.objects.filter(slug__in=['wg','rg','ag','rag','team','dir','review','area','program']).filter(group__state='active').annotate(group_count=Count('group'))
     return render(request, 'group/active_groups.html', {'grouptypes':grouptypes})
 
 def active_dirs(request):
@@ -378,6 +380,14 @@ def active_ags(request):
         group.ads = sorted(roles(group, "ad"), key=extract_last_name)
 
     return render(request, 'group/active_ags.html', { 'groups': groups })
+
+def active_rags(request):
+
+    groups = Group.objects.filter(type="rag", state="active").order_by("acronym")
+    for group in groups:
+        group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
+
+    return render(request, 'group/active_rags.html', { 'groups': groups })
 
 def bofs(request, group_type):
     groups = Group.objects.filter(type=group_type, state="bof")
@@ -408,6 +418,7 @@ def concluded_groups(request):
     sections['RGs'] = Group.objects.filter(type='rg', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
     sections['BOFs'] = Group.objects.filter(type='wg', state="bof-conc").select_related("state", "charter").order_by("parent__name","acronym")
     sections['AGs'] = Group.objects.filter(type='ag', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
+    sections['RAGs'] = Group.objects.filter(type='rag', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
     sections['Directorates'] = Group.objects.filter(type='dir', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
     sections['Review teams'] = Group.objects.filter(type='review', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
     sections['Teams'] = Group.objects.filter(type='team', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")