From 5e1cb2506ccda4bb4e1d676e379d2d9ad9857b38 Mon Sep 17 00:00:00 2001 From: Jim Fenton Date: Sat, 15 Mar 2025 13:37:11 +0700 Subject: [PATCH 1/3] fix: use correct variable to decide to show session notes --- ietf/templates/meeting/session_details_panel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html index 9b7a192f052..87d9e3d6722 100644 --- a/ietf/templates/meeting/session_details_panel.html +++ b/ietf/templates/meeting/session_details_panel.html @@ -310,7 +310,7 @@

Notes and recordings

- {% if session.uses_notes %} + {% if meeting.uses_notes %}
From a2a2a67e23e3036497440689137393338df91324 Mon Sep 17 00:00:00 2001 From: Jim Fenton Date: Sat, 15 Mar 2025 16:14:21 +0700 Subject: [PATCH 2/3] Correct number of lines for selftests --- ietf/meeting/tests_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 519f5f7c2de..d6ace1698c1 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -431,7 +431,7 @@ def test_session_recordings_via_factories(self): r = self.client.get(url) q = PyQuery(r.content) # debug.show("q(f'#notes_and_recordings_{session.pk}')") - self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 1) + self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2) link = q(f"#notes_and_recordings_{session.pk} tr a") self.assertEqual(len(link), 1) self.assertEqual(link[0].attrib['href'], str(session.session_recording_url())) From b6953240b766a76a7fb3d5f60bd7df7389fb3260 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sun, 16 Mar 2025 11:24:51 +0700 Subject: [PATCH 3/3] fix: adjust test to match --- ietf/meeting/tests_views.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index d6ace1698c1..59d7e49f7f1 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -424,7 +424,7 @@ def test_meeting_agenda(self): self.assertEqual(r.status_code, 200) def test_session_recordings_via_factories(self): - session = SessionFactory(meeting__type_id="ietf", meeting__date=date_today()-datetime.timedelta(days=180)) + session = SessionFactory(meeting__type_id="ietf", meeting__date=date_today()-datetime.timedelta(days=180), meeting__number=str(random.randint(108,150))) self.assertEqual(session.meetecho_recording_name, "") self.assertEqual(len(session.recordings()), 0) url = urlreverse("ietf.meeting.views.session_details", kwargs=dict(num=session.meeting.number, acronym=session.group.acronym)) @@ -432,29 +432,33 @@ def test_session_recordings_via_factories(self): q = PyQuery(r.content) # debug.show("q(f'#notes_and_recordings_{session.pk}')") self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2) - link = q(f"#notes_and_recordings_{session.pk} tr a") - self.assertEqual(len(link), 1) - self.assertEqual(link[0].attrib['href'], str(session.session_recording_url())) + links = q(f"#notes_and_recordings_{session.pk} tr a") + self.assertEqual(len(links), 2) + self.assertEqual(links[0].attrib['href'], str(session.notes_url())) + self.assertEqual(links[1].attrib['href'], str(session.session_recording_url())) session.meetecho_recording_name = 'my_test_session_name' session.save() r = self.client.get(url) q = PyQuery(r.content) - self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 1) + self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2) links = q(f"#notes_and_recordings_{session.pk} tr a") - self.assertEqual(len(links), 1) - self.assertEqual(links[0].attrib['href'], session.session_recording_url()) + self.assertEqual(len(links), 2) + self.assertEqual(links[0].attrib['href'], str(session.notes_url())) + self.assertEqual(links[1].attrib['href'], str(session.session_recording_url())) new_recording_url = "https://www.youtube.com/watch?v=jNQXAC9IVRw" new_recording_title = "Me at the zoo" create_recording(session, new_recording_url, new_recording_title) r = self.client.get(url) q = PyQuery(r.content) - self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2) + self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 3) links = q(f"#notes_and_recordings_{session.pk} tr a") - self.assertEqual(len(links), 2) - self.assertEqual(links[0].attrib['href'], new_recording_url) - self.assertIn(new_recording_title, links[0].text_content()) + self.assertEqual(len(links), 3) + self.assertEqual(links[0].attrib['href'], str(session.notes_url())) + self.assertEqual(links[1].attrib['href'], new_recording_url) + self.assertIn(new_recording_title, links[1].text_content()) + self.assertEqual(links[2].attrib['href'], str(session.session_recording_url())) #debug.show("q(f'#notes_and_recordings_{session_pk}')") def test_delete_recordings(self):