Merged in [11686] from rcross@amsl.com:

    A refactor to give secretariat a broader selection of groups to choose from when scheduling non-working group sessions.
 - Legacy-Id: 11694
Note: SVN reference [11686] has been migrated to Git commit b195beb

Author: levkowetz

ietf/secr/meetings/forms.py

@@ -180,7 +180,10 @@ class TimeSlotForm(forms.Form):
 class NonSessionForm(TimeSlotForm):
     short = forms.CharField(max_length=32,label='Short Name',help_text='Enter an abbreviated session name (used for material file names)',required=False)
     type = forms.ModelChoiceField(queryset=TimeSlotTypeName.objects.filter(used=True).exclude(slug__in=('session',)),empty_label=None)
-    group = forms.ModelChoiceField(queryset=Group.objects.filter(acronym__in=('edu','ietf','iepg','tools','iesg','iab','iaoc')),help_text='Required for Session types: other, plenary',required=False)
+    group = forms.ModelChoiceField(
+        queryset=Group.objects.filter(type__in=['ietf','team'],state='active'),
+        help_text='Required for Session types: other, plenary',
+        required=False)
     show_location = forms.BooleanField(required=False)
 
     def clean(self):

ietf/templates/nomcom/edit_members.html

@@ -10,7 +10,7 @@
   {% origin %}
   <h2>
      Edit members
-     <small>Fill in this form with the email addresses of nomcom members to register with the datatracker as nomcom members</small>
+     <small>Fill in this form with the email addresses of nomcom members to register them with the datatracker as nomcom members</small>
   </h2>
 
   <form method="post">