Allow IAB programs to use normal meeting mechanics. Fixes ietf-tools#2970. Commit ready for merge.

 - Legacy-Id: 17764

Author: rjsparks

ietf/group/factories.py

@@ -18,6 +18,15 @@ class Meta:
     list_email = factory.LazyAttribute(lambda a: '%s@ietf.org'% a.acronym)
     uses_milestone_dates = True
 
+    @factory.lazy_attribute
+    def parent(self):
+        if self.type_id in ['wg','ag']:
+            return GroupFactory(type_id='area')
+        elif self.type_id in ['rg']:
+            return GroupFactory(acronym='irtf', type_id='irtf')
+        else:
+            return None
+
 class ReviewTeamFactory(GroupFactory):
 
     type_id = 'review'

ietf/group/migrations/0024_add_groupman_authroles.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-05-04 13:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0023_use_milestone_dates_default_to_true'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='groupfeatures',
+            name='groupman_authroles',
+            field=jsonfield.fields.JSONField(default=['Secretariat'], max_length=128),
+        ),
+        migrations.AddField(
+            model_name='historicalgroupfeatures',
+            name='groupman_authroles',
+            field=jsonfield.fields.JSONField(default=['Secretariat'], max_length=128),
+        ),
+    ]

ietf/group/migrations/0025_populate_groupman_authroles.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-05-01 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+authroles_map = {
+    'adhoc': ['Secretariat'],
+    'admin': ['Secretariat'],
+    'ag': ['Secretariat', 'Area Director'],
+    'area': ['Secretariat'],
+    'dir': ['Secretariat'],
+    'iab': ['Secretariat'],
+    'iana': ['Secretariat'],
+    'iesg': ['Secretariat'],
+    'ietf': ['Secretariat'],
+    'individ': [],
+    'irtf': ['Secretariat'],
+    'ise': ['Secretariat'],
+    'isoc': ['Secretariat'],
+    'nomcom': ['Secretariat'],
+    'program': ['Secretariat', 'IAB'],
+    'review': ['Secretariat'],
+    'rfcedtyp': ['Secretariat'],
+    'rg': ['Secretariat', 'IRTF Chair'],
+    'sdo': ['Secretariat'],
+    'team': ['Secretariat'],
+    'wg': ['Secretariat', 'Area Director'],
+}
+
+def forward(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+    for type_id, authroles in authroles_map.items():
+        GroupFeatures.objects.filter(type_id=type_id).update(groupman_authroles=authroles)
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0024_add_groupman_authroles'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/migrations/0026_programs_meet.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-05-01 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+    program = GroupFeatures.objects.get(type_id='program')
+    program.has_meetings = True
+    program.matman_roles = ['lead', 'chair', 'secr']
+    program.docman_roles = ['lead', 'chair', 'secr']
+    program.groupman_roles = ['lead', 'chair', 'secr']
+    program.role_order = ['lead', 'chair', 'secr']
+    program.save()
+
+def reverse(apps, schema_editor):
+    GroupFeatures = apps.get_model('group', 'GroupFeatures')
+    program = GroupFeatures.objects.get(type_id='program')
+    program.has_meetings = False
+    program.matman_roles = ['lead', 'secr']
+    program.docman_roles = ['lead', 'secr']
+    program.groupman_roles = ['lead', 'secr']
+    program.role_order = ['lead', 'secr']
+    program.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0025_populate_groupman_authroles'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/migrations/0027_programs_have_parents.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-05-08 09:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    Group = apps.get_model('group','Group')
+    iab = Group.objects.get(acronym='iab')
+    Group.objects.filter(type_id='program').update(parent=iab)
+
+def reverse(apps, schema_editor):
+    pass # No point in removing the parents
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0026_programs_meet'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/models.py

@@ -65,9 +65,6 @@ def about_url(self):
             kwargs["group_type"] = self.type_id
         return urlreverse(self.features.about_page, kwargs=kwargs)
 
-    def interim_approval_roles(self):
-        return list(set([ role for role in self.parent.role_set.filter(name__in=['ad', 'chair']) ]))
-
     def is_bof(self):
         return self.state_id in ["bof", "bof-conc"]
 
@@ -238,6 +235,7 @@ class GroupFeatures(models.Model):
     admin_roles             = jsonfield.JSONField(max_length=64, blank=False, default=["chair"]) # Trac Admin
     docman_roles            = jsonfield.JSONField(max_length=128, blank=False, default=["ad","chair","delegate","secr"])
     groupman_roles          = jsonfield.JSONField(max_length=128, blank=False, default=["ad","chair",])
+    groupman_authroles      = jsonfield.JSONField(max_length=128, blank=False, default=["Secretariat",])
     matman_roles            = jsonfield.JSONField(max_length=128, blank=False, default=["ad","chair","delegate","secr"])
     role_order              = jsonfield.JSONField(max_length=128, blank=False, default=["chair","secr","member"],
                                                 help_text="The order in which roles are shown, for instance on photo pages.  Enter valid JSON.")

ietf/group/tests_info.py

@@ -264,7 +264,7 @@ def test_group_about(self):
         can_edit = {
             'wg'   : ['secretary','ad'],
             'rg'   : ['secretary','irtf-chair'],
-            'ag'   : ['secretary', ],
+            'ag'   : ['secretary', 'ad' ],
             'team' : ['secretary',], # The code currently doesn't let ads edit teams or directorates. Maybe it should.
             'dir'  : ['secretary',],
             'review'  : ['secretary',],

ietf/group/utils.py

@@ -15,7 +15,7 @@
 from ietf.community.models import CommunityList, SearchRule
 from ietf.community.utils import reset_name_contains_index_for_rule, can_manage_community_list
 from ietf.doc.models import Document, State
-from ietf.group.models import Group, RoleHistory, Role
+from ietf.group.models import Group, RoleHistory, Role, GroupFeatures
 from ietf.ietfauth.utils import has_role
 from ietf.name.models import GroupTypeName
 from ietf.person.models import Email
@@ -105,6 +105,7 @@ def save_milestone_in_history(milestone):
 
     return h
 
+# TODO: rework this using features.groupman_authroles
 def can_manage_group_type(user, group, type_id=None):
     if not user.is_authenticated:
         return False
@@ -125,8 +126,11 @@ def can_manage_group_type(user, group, type_id=None):
     return has_role(user, ('Secretariat'))
 
 def can_manage_group(user, group):
-    if can_manage_group_type(user, group):
-        return True
+    if not user.is_authenticated:
+        return False
+    for authrole in group.features.groupman_authroles:
+        if has_role(user, authrole):
+            return True
     return group.has_role(user, group.features.groupman_roles)
 
 def milestone_reviewer_for_group_type(group_type):
@@ -141,6 +145,18 @@ def can_manage_materials(user, group):
 def can_manage_session_materials(user, group, session):
     return has_role(user, 'Secretariat') or (group.has_role(user, group.features.matman_roles) and not session.is_material_submission_cutoff())
 
+# Maybe this should be cached...
+def can_manage_some_groups(user):
+    if not user.is_authenticated:
+        return False
+    for gf in GroupFeatures.objects.all():
+        for authrole in gf.groupman_authroles:
+            if has_role(user, authrole):
+                return True
+            if Role.objects.filter(name__in=gf.groupman_roles, group__type_id=gf.type_id, person__user=user).exists():
+                return True
+    return False          
+
 def can_provide_status_update(user, group):
     if not group.features.acts_like_wg:
         return False

ietf/ietfauth/utils.py

@@ -70,6 +70,9 @@ def has_role(user, role_names, *args, **kwargs):
             "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]),
             "AG Secretary": Q(person=person,name="secr", group__type="ag", group__state__in=["active"]),
             "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
+            "Program Lead": Q(person=person,name="lead", group__type="program", group__state="active"),
+            "Program Secretary": Q(person=person,name="secr", group__type="program", group__state="active"),
+            "Program Chair": Q(person=person,name="chair", group__type="program", group__state="active"),
             "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
             "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
             "Nomcom": Q(person=person, group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),

ietf/mailtrigger/models.py

@@ -166,6 +166,8 @@ def gather_group_responsible_directors(self, **kwargs):
                 addrs.extend(group.role_set.filter(name='ad').values_list('email__address',flat=True))
             if group.type_id=='rg':
                 addrs.extend(Recipient.objects.get(slug='stream_managers').gather(**{'streams':['irtf']}))
+            elif group.type_id=='program':
+                addrs.extend(Recipient.objects.get(slug='iab').gather(**{}))
         return addrs
 
     def gather_group_secretaries(self, **kwargs):