diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 4f83cf0cd..0ab7afbdf 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -407,6 +407,40 @@ class MeetingTests(BaseMeetingTestCase):
r = self.client.get(urlreverse('floor-plan', kwargs=dict(num=meeting.number)))
self.assertEqual(r.status_code, 200)
+ def test_session_recordings_via_factories(self):
+ session = SessionFactory(meeting__type_id="ietf")
+ 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))
+ r = self.client.get(url)
+ q = PyQuery(r.content)
+ # debug.show("q('#notes_and_recordings_1')")
+ self.assertEqual(len(q("#notes_and_recordings_1 tr")), 1)
+ link = q("#notes_and_recordings_1 tr a")
+ self.assertEqual(len(link), 1)
+ self.assertEqual(link[0].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("#notes_and_recordings_1 tr")), 1)
+ links = q("#notes_and_recordings_1 tr a")
+ self.assertEqual(len(links), 1)
+ self.assertEqual(links[0].attrib['href'], 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("#notes_and_recordings_1 tr")), 2)
+ links = q("#notes_and_recordings_1 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())
+ #debug.show("q('#notes_and_recordings_1')")
+
def test_agenda_ical_next_meeting_type(self):
# start with no upcoming IETF meetings, just an interim
MeetingFactory(
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 52aeaaa8c..a0f5884b9 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -320,51 +320,50 @@
{% endif %}
{# Recordings #}
- {% if session.has_recordings %}
- {% with session.recordings as recordings %}
- {% if recordings %}
- {# There's no guaranteed order, so this is a bit messy: #}
- {# First, the audio recordings, if any #}
- {% for r in recordings %}
- {% if r.get_href and 'audio' in r.get_href %}
-
- |
- {{ r.title }}
- |
-
- {% endif %}
- {% endfor %}
- {# Then the youtube recordings #}
- {% for r in recordings %}
- {% if r.get_href and 'youtu' in r.get_href %}
-
- |
- {{ r.title }}
- |
-
- {% endif %}
- {% endfor %}
- {# Finally, any other recordings #}
- {% for r in recordings %}
- {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
-
- |
- {{ r.title }}
- |
-
- {% endif %}
- {% endfor %}
- {% endif %}
- {% endwith %}
- {% if session.video_stream_url %}
-
- |
-
- Session recording
-
- |
-
+ {% with session.recordings as recordings %}
+ {% if recordings %}
+ {# There's no guaranteed order, so this is a bit messy: #}
+ {# First, the audio recordings, if any #}
+ {% for r in recordings %}
+ {% if r.get_href and 'audio' in r.get_href %}
+
+ |
+ {{ r.title }}
+ |
+
+ {% endif %}
+ {% endfor %}
+ {# Then the youtube recordings #}
+ {% for r in recordings %}
+ {% if r.get_href and 'youtu' in r.get_href %}
+
+ |
+ {{ r.title }}
+ |
+
+ {% endif %}
+ {% endfor %}
+ {# Finally, any other recordings #}
+ {% for r in recordings %}
+ {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
+
+ |
+ {{ r.title }}
+ |
+
+ {% endif %}
+ {% endfor %}
{% endif %}
+ {% endwith %}
+ {% if session.session_recording_url %}
+
+ |
+
+
+ Meetecho session recording
+
+ |
+
{% endif %}