Skip to content

Commit 1664438

Browse files
committed
Allow area groups to request interim meetings. Fixed ietf-tools#2919. Commit ready for merge.
- Legacy-Id: 17442
1 parent 6248706 commit 1664438

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ietf/meeting/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def clean(self):
103103

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

ietf/meeting/tests_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ def test_interim_request_options(self):
13741374
r = self.client.get("/meeting/interim/request/")
13751375
self.assertEqual(r.status_code, 200)
13761376
q = PyQuery(r.content)
1377-
self.assertEqual(Group.objects.filter(type__in=('wg', 'rg'), state__in=('active', 'proposed')).count(),
1377+
self.assertEqual(Group.objects.filter(type__in=('wg', 'rg', 'ag'), state__in=('active', 'proposed')).count(),
13781378
len(q("#id_group option")) - 1) # -1 for options placeholder
13791379
self.client.logout()
13801380

ietf/templates/group/meetings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{ block.super }}
99
<br>
1010
<a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
11-
{% if can_edit %}
11+
{% if can_edit or can_always_edit %}
1212
<a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
1313
<a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request' %}?group={{group.id}}">Request an interim meeting</a>
1414
{% endif %}

0 commit comments

Comments
 (0)