From 91ec424ff4e8ded575c79f983d6bb9877b179b34 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 30 Sep 2022 11:06:36 -0300 Subject: [PATCH 1/4] fix: include IRTF and BoF groups on meeting requests page --- ietf/meeting/views.py | 16 +++++++++++++--- ietf/templates/meeting/requests.html | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 0c054db97d8..22561dd542d 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1643,10 +1643,17 @@ def api_get_session_materials (request, session_id=None): session = get_object_or_404(Session,pk=session_id) minutes = session.minutes() - + debug.show('request.user') return JsonResponse({ "url": session.agenda().get_href(), "slides": list(map(agenda_extract_slide, session.slides())), + "propose_slides_url": reverse( + 'ietf.meeting.views.propose_session_slides', + kwargs={ + 'num': session.meeting.number, + 'session_id': session.pk, + }, + ), "minutes": { "id": minutes.id, "title": minutes.title, @@ -2320,7 +2327,10 @@ def agenda_json(request, num=None): def meeting_requests(request, num=None): meeting = get_meeting(num) - groups_to_show = Group.objects.filter(state_id='active', type__features__has_meetings=True) + groups_to_show = Group.objects.filter( + state_id__in=('active', 'bof'), + type__features__has_meetings=True, + ) sessions = list( Session.objects.requests().filter( meeting__number=meeting.number, @@ -2340,7 +2350,7 @@ def meeting_requests(request, num=None): for s in sessions: s.current_status_name = status_names.get(s.current_status, s.current_status) s.requested_by_person = session_requesters.get(s.requested_by) - if s.group.parent and s.group.parent.type.slug == 'area': + if s.group.parent and s.group.parent.type.slug in ('area', 'irtf'): s.display_area = s.group.parent else: s.display_area = None diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html index bfb744d0ab6..88cd56f9e6c 100644 --- a/ietf/templates/meeting/requests.html +++ b/ietf/templates/meeting/requests.html @@ -67,7 +67,7 @@

{{ session.attendees }}
- {% endif %} + {% endif %}{% if session.group.is_bof %}BOF{% endif %} {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %} From 6b97d68a6a6dae837588469a155489a8a0d9d7fc Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 30 Sep 2022 11:55:37 -0300 Subject: [PATCH 2/4] test: test bof/irtf groups on the meeting requests page --- ietf/meeting/tests_views.py | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 785cf8fcc4c..032e052d13c 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -6458,7 +6458,7 @@ def test_meeting_requests(self): group_type_without_meetings = 'editorial' self.assertFalse(GroupFeatures.objects.get(pk=group_type_without_meetings).has_meetings) - area = GroupFactory(type_id='area') + area = GroupFactory(type_id='area', acronym='area') requested_session = SessionFactory(meeting=meeting,group__parent=area,status_id='schedw',add_to_schedule=False) conflicting_session = SessionFactory(meeting=meeting,group__parent=area,status_id='schedw',add_to_schedule=False) ConstraintFactory(name_id='key_participant',meeting=meeting,source=requested_session.group,target=conflicting_session.group) @@ -6498,7 +6498,21 @@ def test_meeting_requests(self): status_id='schedw', add_to_schedule=False, ) - + # bof sessions should be shown + bof_session = SessionFactory( + meeting=meeting, + group__parent=area, + group__state_id='bof', + status_id='schedw', + add_to_schedule=False, + ) + # rg sessions should be shown under 'irtf' heading + rg_session = SessionFactory( + meeting=meeting, + group__type_id='rg', + status_id='schedw', + add_to_schedule=False, + ) def _sreq_edit_link(sess): return urlreverse( 'ietf.secr.sreq.views.edit', @@ -6531,6 +6545,17 @@ def _sreq_edit_link(sess): self.assertContains(r, _sreq_edit_link(has_meetings_not_meeting)) # link to the session request self.assertNotContains(r, not_has_meetings.group.acronym) self.assertNotContains(r, _sreq_edit_link(not_has_meetings)) # no link to the session request + self.assertContains(r, bof_session.group.acronym) + self.assertContains(r, _sreq_edit_link(bof_session)) # link to the session request + self.assertContains(r, rg_session.group.acronym) + self.assertContains(r, _sreq_edit_link(rg_session)) # link to the session request + # check headings - note that the special types (has_meetings, etc) do not have a group parent + # so they show up in 'other' + q = PyQuery(r.content) + self.assertEqual(len(q('h2#area')), 1) + self.assertEqual(len(q('h2#other-groups')), 1) + self.assertEqual(len(q('h2#irtf')), 1) # rg group has irtf group as parent + def test_request_minutes(self): meeting = MeetingFactory(type_id='ietf') From c18e3d1ab0252bd9d5019f9949ac2b4df7311ff0 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 30 Sep 2022 12:03:47 -0300 Subject: [PATCH 3/4] chore: remove some accidentally committed changes --- ietf/meeting/views.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 22561dd542d..e555c53f349 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1643,17 +1643,10 @@ def api_get_session_materials (request, session_id=None): session = get_object_or_404(Session,pk=session_id) minutes = session.minutes() - debug.show('request.user') + return JsonResponse({ "url": session.agenda().get_href(), "slides": list(map(agenda_extract_slide, session.slides())), - "propose_slides_url": reverse( - 'ietf.meeting.views.propose_session_slides', - kwargs={ - 'num': session.meeting.number, - 'session_id': session.pk, - }, - ), "minutes": { "id": minutes.id, "title": minutes.title, From 94b272d5d6c53095d3f1ff7494c2c47e219018bb Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 30 Sep 2022 12:06:05 -0300 Subject: [PATCH 4/4] style: improve formatting of requests.html template --- ietf/templates/meeting/requests.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html index 88cd56f9e6c..ce671f0d8cb 100644 --- a/ietf/templates/meeting/requests.html +++ b/ietf/templates/meeting/requests.html @@ -67,7 +67,10 @@

{{ session.attendees }}
- {% endif %}{% if session.group.is_bof %}BOF{% endif %} + {% endif %} + {% if session.group.is_bof %} + BOF + {% endif %} {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %}