Merged in [12722] from rjsparks@nostrum.com:

    Added programs to the datatracker. Added use of restructuredtext for group about pages. Generalized several places where code handles different group types. Improved testing of group about.
 - Legacy-Id: 12725
Note: SVN reference [12722] has been migrated to Git commit e0ea8b0

Author: levkowetz

ietf/community/tests.py

@@ -16,6 +16,8 @@
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 from ietf.utils.mail import outbox
+from ietf.group.factories import GroupFactory
+from ietf.person.factories import PersonFactory
 
 class CommunityListTests(TestCase):
     def test_rule_matching(self):
@@ -158,6 +160,19 @@ def test_manage_group_list(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
+        # Verify GET also works with non-WG and RG groups
+        for gtype in ['area','program']:
+            g = GroupFactory.create(type_id=gtype)
+            # make sure the group's features have been initialized to improve coverage
+            _ = g.features # pyflakes:ignore
+            p = PersonFactory()
+            g.role_set.create(name_id={'area':'ad','program':'lead'}[gtype],person=p, email=p.email())
+            url = urlreverse(ietf.community.views.manage_list, kwargs={ "acronym": g.acronym })
+            setup_default_community_list_for_group(g)
+            self.client.login(username=p.user.username,password=p.user.username+"+password")
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+
     def test_track_untrack_document(self):
         draft = make_test_data()
 

ietf/community/utils.py

@@ -49,6 +49,8 @@ def can_manage_community_list(user, clist):
             return Role.objects.filter(name__slug='ad', person__user=user, group=clist.group).exists()
         elif clist.group.type_id in ('wg', 'rg'):
             return Role.objects.filter(name__slug='chair', person__user=user, group=clist.group).exists()
+        elif clist.group.type_id in ('program'):
+            return Role.objects.filter(name__slug='lead', person__user=user, group=clist.group).exists()
 
     return False
 

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'])
+    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
     for p in parents:
         p.menu_url = '/%s/'%p.slug
     return render_to_string('base/menu_active_groups.html', { 'parents': parents })

ietf/group/features.py

@@ -5,8 +5,10 @@ class GroupFeatures(object):
     has_milestones = False
     has_chartering_process = False
     has_documents = False # i.e. drafts/RFCs
+    has_dependencies = False # Do dependency graphs for group documents make sense?
     has_materials = False
     has_reviews = False
+    has_default_jabber = False
     customize_workflow = False
     about_page = "group_about"
     default_tab = about_page
@@ -19,10 +21,18 @@ def __init__(self, group):
             self.has_chartering_process = True
             self.has_documents = True
             self.customize_workflow = True
+            self.has_default_jabber = True
+            self.has_dependencies = True
             self.default_tab = "group_docs"
         elif group.type_id in ("team",):
             self.has_materials = True
             self.default_tab = "group_about"
+        elif group.type_id in ("program",):
+            self.has_documents = True
+            self.has_milestones = True
+            self.admin_roles = ["lead",]
+        elif group.type_id == "dir":
+            self.admin_roles = ["chair", "secr"]
 
         if self.has_chartering_process:
             self.about_page = "group_charter"
@@ -33,5 +43,3 @@ def __init__(self, group):
             import ietf.group.views
             self.default_tab = ietf.group.views_review.review_requests
 
-        if group.type_id == "dir":
-            self.admin_roles = ["chair", "secr"]

ietf/group/migrations/0010_iab_programs.py

@@ -101,7 +101,7 @@ def edit_milestones(request, acronym, group_type=None, milestone_set="current"):
             if milestone_set == "current":
                 needs_review = True
     else:
-        return HttpResponseForbidden("You don't have permission to access this view")
+        return HttpResponseForbidden("You are not authorized to edit the milestones of this group.")
 
     if milestone_set == "current":
         title = "Edit milestones for %s %s" % (group.acronym, group.type.name)
@@ -333,7 +333,7 @@ def reset_charter_milestones(request, group_type, acronym):
         raise Http404
 
     if not can_manage_group(request.user, group):
-        return HttpResponseForbidden("You don't have permission to access this view")
+        return HttpResponseForbidden("You are not authorized to change the milestones for this group.")
 
     current_milestones = group.groupmilestone_set.filter(state="active")
     charter_milestones = group.groupmilestone_set.filter(state="charter")

ietf/group/milestones.py

@@ -28,8 +28,9 @@
 from ietf.meeting.factories import SessionFactory
 from ietf.name.models import DocTagName, GroupStateName, GroupTypeName
 from ietf.person.models import Person, Email
+from ietf.person.factories import PersonFactory
 from ietf.utils.mail import outbox, empty_outbox
-from ietf.utils.test_data import make_test_data, create_person, make_review_data
+from ietf.utils.test_data import make_test_data, make_review_data
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
 
 def group_urlreverse_list(group, viewname):
@@ -62,30 +63,15 @@ def test_active_groups(self):
         self.assertTrue(group.name in unicontent(r))
         self.assertTrue(group.ad_role().person.plain_name() in unicontent(r))
 
-        url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="rg"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue('Active research groups' in unicontent(r))
-
-        url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="area"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue("Far Future (farfut)" in unicontent(r))
-
-        url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="ag"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active area groups" in unicontent(r))
-
-        url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="dir"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active directorates" in unicontent(r))
-
-        url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="team"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active teams" in unicontent(r))
+        for t in ('rg','area','ag','dir','team','program'):
+            g = GroupFactory.create(type_id=t,state_id='active') 
+            if t=='dir':
+                g.parent = GroupFactory.create(type_id='area',state_id='active')
+                g.save()
+            url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type=t))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertTrue(g.acronym in unicontent(r))
 
         url = urlreverse('ietf.group.views.active_groups', kwargs=dict())
         r = self.client.get(url)
@@ -269,42 +255,72 @@ def test_group_charter(self):
 
     def test_group_about(self):
 
-        def verify_cannot_edit_group(url, username):
-            self.client.login(username=username, password=username+"+password")
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 403)
+        make_test_data()
 
-        def verify_can_edit_group(url, username):
-            self.client.login(username=username, password=username+"+password")
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
+        p = PersonFactory(user__username='iab-member')
+        Group.objects.get(acronym='iab').role_set.create(name_id='member',person=p,email=p.email())
 
-        make_test_data()
-        group = Group.objects.create(
-            type_id="team",
-            acronym="testteam",
-            name="Test Team",
-            description="The test team is testing.",
-            state_id="active",
-            parent = Group.objects.get(acronym="farfut"),
-        )
-        create_person(group, "chair", name="Testteam Chairman", username="teamchairman")
+        interesting_users = [ 'plain','iana','iab-chair','irtf-chair', 'marschairman', 'teamchairman','ad', 'iab-member', 'secretary', ]
 
-        for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
-            url = group.about_url()
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            self.assertTrue(group.name in unicontent(r))
-            self.assertTrue(group.acronym in unicontent(r))
-            self.assertTrue(group.description in unicontent(r))
+        can_edit = {
+            'wg'   : ['secretary','ad'],
+            'rg'   : ['secretary','irtf-chair'],
+            'ag'   : ['secretary', ],
+            'team' : ['secretary',], # The code currently doesn't let ads edit teams or directorates. Maybe it should.
+            'dir'  : ['secretary',],
+            'program' : ['secretary', 'iab-member'],
+        }
 
-        for url in group_urlreverse_list(group, 'ietf.group.views_edit.edit'):
+        def setup_role(group, role_id):
+            p = PersonFactory(user__username="%s_%s"%(group.acronym,role_id))
+            group.role_set.create(name_id=role_id,person=p,email=p.email())
+            can_edit[group.type_id].append(p.user.username)
+            interesting_users.append(p.user.username)
 
-            for username in ['plain','iana','iab chair','irtf chair','marschairman']:
-                verify_cannot_edit_group(url, username)
+        test_groups = []
 
-            for username in ['secretary','teamchairman','ad']:
-                verify_can_edit_group(url, username)
+        for t in ['wg','rg','ag','team']:
+            g = GroupFactory(type_id=t)
+            setup_role(g,'chair')
+            test_groups.append(g)
+
+        g = GroupFactory(type_id='dir')
+        setup_role(g,'secr')
+        test_groups.append(g)
+
+        g = GroupFactory(type_id='program')
+        setup_role(g, 'lead')
+        test_groups.append(g)
+
+        def verify_cannot_edit_group(url, group, username):
+            self.client.logout()
+            self.client.login(username=username, password=username+"+password")
+            r = self.client.get(url)
+            self.assertTrue(r.status_code in (302,403),"%s should not be able to edit %s of type %s"%(username,group.acronym,group.type_id))
+
+        def verify_can_edit_group(url, group, username):
+            self.client.logout()
+            self.client.login(username=username, password=username+"+password")
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, "%s should be able to edit %s of type %s"%(username,group.acronym,group.type_id))
+
+        for group in test_groups:
+
+            for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
+                url = group.about_url()
+                r = self.client.get(url)
+                self.assertEqual(r.status_code, 200)
+                self.assertTrue(group.name in unicontent(r))
+                self.assertTrue(group.acronym in unicontent(r))
+                self.assertTrue(group.description in unicontent(r))
+    
+            for url in group_urlreverse_list(group, 'ietf.group.views_edit.edit'):
+    
+                for username in can_edit[group.type_id]:
+                    verify_can_edit_group(url, group, username)
+    
+                for username in list(set(interesting_users)-set(can_edit[group.type_id])):
+                    verify_cannot_edit_group(url, group, username)
 
     def test_materials(self):
         make_test_data()

ietf/group/tests_info.py

@@ -99,6 +99,8 @@ def can_manage_group_type(user, group):
             return has_role(user, ('Area Director', 'Secretariat'))
         elif group.is_decendant_of("irtf"):
             return has_role(user, ('IRTF Chair', 'Secretariat'))
+    elif group.type_id == "program":
+        return has_role(user, ('IAB', 'Secretariat',))        
     return has_role(user, ('Secretariat'))
 
 def can_manage_group(user, group):

ietf/group/utils.py

@@ -219,11 +219,13 @@ def active_groups(request, group_type=None):
         return active_teams(request)
     elif group_type == "dir":
         return active_dirs(request)
+    elif group_type == "program":
+        return active_programs(request)
     else:
         raise Http404
 
 def active_group_types(request):
-    grouptypes = GroupTypeName.objects.filter(slug__in=['wg','rg','ag','team','dir','area'])
+    grouptypes = GroupTypeName.objects.filter(slug__in=['wg','rg','ag','team','dir','area','program'])
     return render(request, 'group/active_groups.html', {'grouptypes':grouptypes})
 
 def active_dirs(request):
@@ -240,6 +242,12 @@ def active_teams(request):
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
     return render(request, 'group/active_teams.html', {'teams' : teams })
 
+def active_programs(request):
+    programs = Group.objects.filter(type="program", state="active").order_by("name")
+    for group in programs:
+        group.leads = sorted(roles(group, "lead"), key=extract_last_name)
+    return render(request, 'group/active_programs.html', {'programs' : programs })
+
 def active_areas(request):
 	areas = Group.objects.filter(type="area", state="active").order_by("name")  
 	return render(request, 'group/active_areas.html', {'areas': areas })

ietf/group/views.py

@@ -416,7 +416,11 @@ def conclude(request, acronym, group_type=None):
             e.desc = "Requested closing group"
             e.save()
 
-            return redirect(group.features.about_page, group_type=group_type, acronym=group.acronym)
+            kwargs = {'acronym':group.acronym}
+            if group_type:
+                kwargs['group_type'] = group_type
+   
+            return redirect(group.features.about_page, **kwargs)
     else:
         form = ConcludeForm()