A second performance improvement for the proceedings pages. Commit ready for merge.

- Legacy-Id: 12353
This commit is contained in:
Robert Sparks 2016-11-15 07:38:21 +00:00
parent ba60c115fa
commit a3cc9df465
2 changed files with 11 additions and 7 deletions

View file

@ -18,3 +18,7 @@ def hack_recording_title(recording,add_timestamp=False):
@register.filter
def status_for_meeting(group,meeting):
return group.status_for_meeting(meeting)
@register.filter
def meeting_href(doc,meeting):
return doc.href(meeting)

View file

@ -23,14 +23,14 @@
{% else %}
<td>
{% if session.agenda %}
<a href="{{ session.agenda.href }}">Agenda</a><br>
<a href="{{ session.agenda|meeting_href:meeting }}">Agenda</a><br>
{% else %}
{% if show_agenda == "True" and not meeting.proceedings_final %}
<span class="label label-warning">No agenda</span><br>
{% endif %}
{% endif %}
{% if session.minutes %}
<a href="{{ session.minutes.href }}">Minutes</a><br>
<a href="{{ session.minutes|meeting_href:meeting }}">Minutes</a><br>
{% else %}
{% if show_agenda == "True" and not meeting.proceedings_final %}
<span class="label label-warning">No minutes</span><br>
@ -38,10 +38,10 @@
{% endif %}
{% if session.all_meeting_bluesheets %}
{% if session.all_meeting_bluesheets|length == 1 %}
<a href="{{session.all_meeting_bluesheets.0.href}}">Bluesheets</a><br>
<a href="{{session.all_meeting_bluesheets.0|meeting_href:meeting}}">Bluesheets</a><br>
{% else %}
{% for bs in session.all_meeting_bluesheets %}
<a href="{{bs.href}}">Bluesheets {{bs.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
<a href="{{bs|meeting_href:meeting}}">Bluesheets {{bs.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
{% endfor %}
{% endif %}
{% endif %}
@ -55,18 +55,18 @@
<td>
{% if session.all_meeting_sessions_for_group|length == 1 %}
{% for rec in session.all_meeting_recordings %}
<a href="{{rec.href}}">{{rec|hack_recording_title:False}}</a><br>
<a href="{{rec|meeting_href:meeting}}">{{rec|hack_recording_title:False}}</a><br>
{% endfor %}
{% else %}
{% for rec in session.all_meeting_recordings %}
<a href="{{rec.href}}">{{rec|hack_recording_title:True}}</a><br>
<a href="{{rec|meeting_href:meeting}}">{{rec|hack_recording_title:True}}</a><br>
{% endfor %}
{% endif %}
</td>
<td>
{% with session.slides as slides %}
{% for slide in slides %}
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
<a href="{{ slide|meeting_href:meeting }}">{{ slide.title|clean_whitespace }}</a>
<br>
{% empty %}
{% if not meeting.proceedings_final %}