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

    Adjust tests and forms to match changes to permissions made in through the admin. These need to use the data rather than the code. See ietf-tools#3393.
 - Legacy-Id: 19331
Note: SVN reference [19311] has been migrated to Git commit 4240ce0

Author: rjsparks

ietf/group/tests_info.py

@@ -280,7 +280,7 @@ def test_group_about(self):
             '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.
+            'team' : ['secretary' , 'ad'],
             'dir'  : ['secretary',],
             'review'  : ['secretary',],
             'program' : ['secretary', 'iab-member'],

ietf/meeting/forms.py

@@ -155,7 +155,7 @@ def set_group_options(self):
             return  # don't reduce group options
         q_objects = Q()
         if has_role(self.user, "Area Director"):
-            q_objects.add(Q(type__in=["wg", "ag"], state__in=("active", "proposed", "bof")), Q.OR)
+            q_objects.add(Q(type__in=["wg", "ag", "team"], state__in=("active", "proposed", "bof")), Q.OR)
         if has_role(self.user, "IRTF Chair"):
             q_objects.add(Q(type__in=["rg", "rag"], state__in=("active", "proposed")), Q.OR)
         if has_role(self.user, "WG Chair"):