Skip to content

Commit a3cc9df

Browse files
committed
A second performance improvement for the proceedings pages. Commit ready for merge.
- Legacy-Id: 12353
1 parent ba60c11 commit a3cc9df

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

ietf/meeting/templatetags/proceedings_filters.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ def hack_recording_title(recording,add_timestamp=False):
1818
@register.filter
1919
def status_for_meeting(group,meeting):
2020
return group.status_for_meeting(meeting)
21+
22+
@register.filter
23+
def meeting_href(doc,meeting):
24+
return doc.href(meeting)

ietf/templates/meeting/group_proceedings.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@
2323
{% else %}
2424
<td>
2525
{% if session.agenda %}
26-
<a href="{{ session.agenda.href }}">Agenda</a><br>
26+
<a href="{{ session.agenda|meeting_href:meeting }}">Agenda</a><br>
2727
{% else %}
2828
{% if show_agenda == "True" and not meeting.proceedings_final %}
2929
<span class="label label-warning">No agenda</span><br>
3030
{% endif %}
3131
{% endif %}
3232
{% if session.minutes %}
33-
<a href="{{ session.minutes.href }}">Minutes</a><br>
33+
<a href="{{ session.minutes|meeting_href:meeting }}">Minutes</a><br>
3434
{% else %}
3535
{% if show_agenda == "True" and not meeting.proceedings_final %}
3636
<span class="label label-warning">No minutes</span><br>
3737
{% endif %}
3838
{% endif %}
3939
{% if session.all_meeting_bluesheets %}
4040
{% if session.all_meeting_bluesheets|length == 1 %}
41-
<a href="{{session.all_meeting_bluesheets.0.href}}">Bluesheets</a><br>
41+
<a href="{{session.all_meeting_bluesheets.0|meeting_href:meeting}}">Bluesheets</a><br>
4242
{% else %}
4343
{% for bs in session.all_meeting_bluesheets %}
44-
<a href="{{bs.href}}">Bluesheets {{bs.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
44+
<a href="{{bs|meeting_href:meeting}}">Bluesheets {{bs.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
4545
{% endfor %}
4646
{% endif %}
4747
{% endif %}
@@ -55,18 +55,18 @@
5555
<td>
5656
{% if session.all_meeting_sessions_for_group|length == 1 %}
5757
{% for rec in session.all_meeting_recordings %}
58-
<a href="{{rec.href}}">{{rec|hack_recording_title:False}}</a><br>
58+
<a href="{{rec|meeting_href:meeting}}">{{rec|hack_recording_title:False}}</a><br>
5959
{% endfor %}
6060
{% else %}
6161
{% for rec in session.all_meeting_recordings %}
62-
<a href="{{rec.href}}">{{rec|hack_recording_title:True}}</a><br>
62+
<a href="{{rec|meeting_href:meeting}}">{{rec|hack_recording_title:True}}</a><br>
6363
{% endfor %}
6464
{% endif %}
6565
</td>
6666
<td>
6767
{% with session.slides as slides %}
6868
{% for slide in slides %}
69-
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
69+
<a href="{{ slide|meeting_href:meeting }}">{{ slide.title|clean_whitespace }}</a>
7070
<br>
7171
{% empty %}
7272
{% if not meeting.proceedings_final %}

0 commit comments

Comments
 (0)