From 0e599ea8640910bd82160163757a86126709646c Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Tue, 24 May 2022 15:23:47 -0500
Subject: [PATCH] fix: show session name on meeting/upcoming. Fixes #4010.
 (#4017)

* fix: show session name on meeting/upcoming. Fixes #4010.

* fix: remove stray right paren
---
 ietf/templates/meeting/upcoming.html | 4 ++--
 ietf/templates/meeting/upcoming.ics  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index e4e5c108b..38a8fddf9 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -77,7 +77,7 @@
                                 <td>
                                     <a class="interim-meeting-link"
                                        href="{% url 'ietf.meeting.views.session_details' num=meeting.number acronym=group.acronym %}">
-                                        {{ meeting.number }}
+                                        {% firstof session.name meeting.number %}
                                     </a>
                                 </td>
                                 {% if session.current_status == 'canceled' %}
@@ -130,7 +130,7 @@
                   {% else %} {# if it's not a Meeting, it's a Session #}
                       {% with session=entry %}
                           {
-                              group: '{% if session.group %}{{session.group.acronym}}{% endif %}',
+                              group: '{% if session.group %}{{session.group.acronym}}{% endif %}{% if session.name %} - {{session.name}}{% endif %}',
                               filter_keywords: ["{{ session.filter_keywords|join:'","' }}"],
                               start_moment: moment.utc('{{session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i"}}'),
                               end_moment: moment.utc('{{session.official_timeslotassignment.timeslot.utc_end_time | date:"Y-m-d H:i"}}'),
diff --git a/ietf/templates/meeting/upcoming.ics b/ietf/templates/meeting/upcoming.ics
index 5e032a458..088b94bf5 100644
--- a/ietf/templates/meeting/upcoming.ics
+++ b/ietf/templates/meeting/upcoming.ics
@@ -4,7 +4,7 @@ METHOD:PUBLISH
 PRODID:-//IETF//datatracker.ietf.org ical upcoming//EN
 {{vtimezones}}{% for item in assignments %}BEGIN:VEVENT
 UID:ietf-{{item.session.meeting.number}}-{{item.timeslot.pk}}
-SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{{item.session.group.acronym|lower}} - {{item.session.group.name}}{%endif%}
+SUMMARY:{% if item.session.name %}{{item.session.group.acronym|lower}} - {{item.session.name|ics_esc}}{% else %}{{item.session.group.acronym|lower}} - {{item.session.group.name}}{%endif%}
 {% if item.schedule.meeting.city %}LOCATION:{{item.schedule.meeting.city}},{{item.schedule.meeting.country}}
 {% endif %}STATUS:{{item.session.ical_status}}
 CLASS:PUBLIC