From 1664438c52d245bf67520c184e6070f13122bff7 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Mon, 16 Mar 2020 16:45:01 +0000
Subject: [PATCH] Allow area groups to request interim meetings. Fixed #2919.
 Commit ready for merge.  - Legacy-Id: 17442

---
 ietf/meeting/forms.py              | 2 +-
 ietf/meeting/tests_views.py        | 2 +-
 ietf/templates/group/meetings.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py
index bec32a1ef..c8680a099 100644
--- a/ietf/meeting/forms.py
+++ b/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"),
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index ade11103c..17bc0beb5 100644
--- a/ietf/meeting/tests_views.py
+++ b/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()
 
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index 84d6f6a78..8c8d24ded 100644
--- a/ietf/templates/group/meetings.html
+++ b/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 %}