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

Allow area groups to request interim meetings. Fixed #2919.
 - Legacy-Id: 17443
Note: SVN reference [17442] has been migrated to Git commit 1664438c52

ietf/meeting/forms.py

@@ -103,7 +103,7 @@ class InterimSessionInlineFormSet(BaseInlineFormSet):
 
 class InterimMeetingModelForm(forms.ModelForm):
     # TODO: Should area groups get to schedule Interims?
-    group = GroupModelChoiceField(queryset=Group.objects.filter(type__in=('wg', 'rg'), state__in=('active', 'proposed', 'bof')).order_by('acronym'), required=False)
+    group = GroupModelChoiceField(queryset=Group.objects.filter(type__in=('wg', 'rg', 'ag'), state__in=('active', 'proposed', 'bof')).order_by('acronym'), required=False)
     in_person = forms.BooleanField(required=False)
     meeting_type = forms.ChoiceField(choices=(
         ("single", "Single"),

ietf/meeting/tests_views.py

@@ -1374,7 +1374,7 @@ class InterimTests(TestCase):
         r = self.client.get("/meeting/interim/request/")
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(Group.objects.filter(type__in=('wg', 'rg'), state__in=('active', 'proposed')).count(),
+        self.assertEqual(Group.objects.filter(type__in=('wg', 'rg', 'ag'), state__in=('active', 'proposed')).count(),
             len(q("#id_group option")) - 1)  # -1 for options placeholder
         self.client.logout()
 

ietf/templates/group/meetings.html

@@ -8,7 +8,7 @@
   {{ block.super }}
   <br>
   <a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
-  {% if can_edit %}
+  {% if can_edit or can_always_edit %}
   <a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
   <a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request' %}?group={{group.id}}">Request an interim meeting</a>
   {% endif %}