This commit replaces the code defined group features with features held

in a database table:

- Added a GroupFeatures model to the group models, and removed the old 
  features.py
- Added a agenda type for future use in showing different group types on
  different agendas.
- Renamed the group feature has_materials to has_nonsession_materials.
- Added API resources and admin support for the new tables.
- Added a Directorate (with reviews) group type as complement to
  Directorate, to distinguish between directorates with and without reviews.
- Adjusted tests as needed.
- Updated the fixtures, and fixed the generate_fixtures script to include
  the new AgendaTypeName objects.

There still exists about 70 instances of code comparing the group type
with a list of types; most of these should probably be replaced with new
features, instead, to make it possible to add new group types through the
database table, rather than having to edit the code.  That was the purpose
of this refactoring from the start, but the presence of this large number
of comparisons of group type against lists of types defeats the goal until
we add appropriate features and replace the group type list comparisons.
 - Legacy-Id: 15316

Author: levkowetz

ietf/doc/templatetags/active_groups_menu.py

@@ -7,7 +7,7 @@
 
 @register.simple_tag
 def active_groups_menu():
-    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','review','program'])
     for p in parents:
         p.menu_url = '/%s/'%p.slug
     return render_to_string('base/menu_active_groups.html', { 'parents': parents })

ietf/doc/tests_review.py

@@ -52,8 +52,8 @@ def test_request_review(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
         NewRevisionDocEventFactory(doc=doc,rev='01')
         RoleFactory(name_id='chair',person__user__username='marschairman',group=doc.group)
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
-        review_team3 = ReviewTeamFactory(acronym="reviewteam3", name="Review Team3", type_id="dir", list_email="reviewteam3@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team3 = ReviewTeamFactory(acronym="reviewteam3", name="Review Team3", type_id="review", list_email="reviewteam3@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team3,person=rev_role.person,name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
@@ -111,7 +111,7 @@ def test_request_review_of_rfc(self):
     def test_doc_page(self):
 
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
 
@@ -132,7 +132,7 @@ def test_doc_page(self):
 
     def test_review_request(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
 
@@ -145,7 +145,7 @@ def test_review_request(self):
 
     def test_close_request(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -268,7 +268,7 @@ def get_skip_next(person):
 
     def test_assign_reviewer(self):
         doc = WgDraftFactory(pages=2)
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',person__name=u'Some Reviewer',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='marschairman',person__name=u'WG Cháir Man',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
@@ -382,7 +382,7 @@ def test_assign_reviewer(self):
     def test_accept_reviewer_assignment(self):
 
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='requested',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
 
@@ -403,7 +403,7 @@ def test_accept_reviewer_assignment(self):
 
     def test_reject_reviewer_assignment(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -476,7 +476,7 @@ def make_test_mbox_tarball(self, review_req):
 
     def test_search_mail_archive(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -523,7 +523,7 @@ def test_search_mail_archive(self):
     def setup_complete_review_test(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
         NewRevisionDocEventFactory(doc=doc,rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -804,7 +804,7 @@ def test_revise_review_enter_content(self):
 
     def test_edit_comment(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -825,7 +825,7 @@ def test_edit_comment(self):
 
     def test_edit_deadline(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="dir", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,reviewer=rev_role.person.email_set.first(),deadline=datetime.datetime.now()+datetime.timedelta(days=20))

ietf/doc/views_doc.py

@@ -572,7 +572,7 @@ def document_main(request, name, rev=None):
                                        latest_rev=latest_rev,
                                        snapshot=snapshot,
                                        can_manage_material=can_manage_material,
-                                       in_group_materials_types = doc.group and doc.group.features.has_materials and doc.type_id in doc.group.features.material_types,
+                                       in_group_materials_types = doc.group and doc.group.features.has_nonsession_materials and doc.type_id in doc.group.features.material_types,
                                        other_types=other_types,
                                        presentations=presentations,
                                        ))

ietf/doc/views_material.py

@@ -20,7 +20,7 @@
 @login_required
 def choose_material_type(request, acronym):
     group = get_object_or_404(Group, acronym=acronym)
-    if not group.features.has_materials:
+    if not group.features.has_nonsession_materials:
         raise Http404
 
     return render(request, 'doc/material/choose_material_type.html', {
@@ -85,7 +85,7 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
 
     if action == "new":
         group = get_object_or_404(Group, acronym=acronym)
-        if not group.features.has_materials:
+        if not group.features.has_nonsession_materials:
             raise Http404
 
         doc = None
@@ -95,7 +95,8 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
         group = doc.group
         document_type = doc.type
 
-    if document_type not in DocTypeName.objects.filter(slug__in=group.features.material_types) and document_type.slug not in ['minutes','agenda','bluesheets',]:
+    if (document_type not in DocTypeName.objects.filter(slug__in=group.features.material_types)
+        and document_type.slug not in ['minutes','agenda','bluesheets',]):
         raise Http404
 
 

ietf/group/admin.py

@@ -10,7 +10,7 @@
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
 
-from ietf.group.models import (Group, GroupHistory, GroupEvent, GroupURL, GroupMilestone,
+from ietf.group.models import (Group, GroupFeatures, GroupHistory, GroupEvent, GroupURL, GroupMilestone,
     GroupMilestoneHistory, GroupStateTransitions, Role, RoleHistory, ChangeStateGroupEvent,
     MilestoneGroupEvent, )
 
@@ -100,6 +100,25 @@ def send_one_reminder(self, request, object_id):
 
 admin.site.register(Group, GroupAdmin)
 
+class GroupFeaturesAdmin(admin.ModelAdmin):
+    list_display = [
+        'type',
+        'customize_workflow',
+        'has_chartering_process',
+        'has_default_jabber',
+        'has_dependencies',
+        'has_documents',
+        'has_nonsession_materials',
+        'has_milestones',
+        'has_reviews',
+        'material_types',
+        'agenda_type',
+        'admin_roles',
+        'about_page',
+        'default_tab',
+        ]
+admin.site.register(GroupFeatures, GroupFeaturesAdmin)
+
 class GroupHistoryAdmin(admin.ModelAdmin):
     list_display = ["time", "acronym", "name", "type"]
     list_display_links = ["acronym", "name"]

ietf/group/factories.py

@@ -19,7 +19,7 @@ class ReviewTeamFactory(factory.DjangoModelFactory):
     class Meta:
         model = Group
 
-    type_id = 'dir'
+    type_id = 'review'
     name = factory.Faker('sentence',nb_words=6)
     acronym = factory.Sequence(lambda n: 'acronym%d' %n)
     state_id = 'active'

ietf/group/features.py

@@ -27,7 +27,7 @@
 
 def roles_for_group_type(group_type):
     roles = ["chair", "secr", "techadv", "delegate", ]
-    if group_type == "dir":
+    if group_type == "review":
         roles.append("reviewer")
     return roles