* fix: show session name on meeting/upcoming. Fixes #4010. * fix: remove stray right paren
This commit is contained in:
parent
8e0ff71709
commit
0e599ea864
|
@ -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"}}'),
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue