altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [16592] from rjsparks@nostrum.com:

Browse source 
Change how the session details page links to documents to not link to a specific version. Fixes #2758. See also #2756.
 - Legacy-Id: 16610
Note: SVN reference [16592] has been migrated to Git commit c6c086b122dbd57cb6a55ed7f68be4a8dfd877b6
This commit is contained in:
Henrik Levkowetz 2019-08-01 20:17:59 +00:00
parent 2b1dd0f3e8
commit 1a35504693
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ietf/templates/meeting/session_details_panel.html
View file

@ -27,14 +27,10 @@
<table class="table table-condensed table-striped">
{% for pres in session.filtered_artifacts %}
<tr>
{% if pres.rev %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
{% else %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
{% endif %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
<td>
<a href="{{pres.document.href}}">{{pres.document.title}}</a>
<a href="{{url}}">({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %})</a>
<a href="{{url}}">({{ pres.document.name }})</a>
</td>
{% if user|has_role:"Secretariat" or can_manage_materials %}
<td class="col-md-2">
@ -73,14 +69,10 @@
<tbody>
{% for pres in session.filtered_slides %}
<tr data-order="{{pres.order}}" data-url="{% url 'ietf.meeting.views.set_slide_order' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
{% if pres.rev %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
{% else %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
{% endif %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
<td>
<a href="{{pres.document.href}}">{{pres.document.title}} </a>
<a href="{{url}}">({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %}) </a>
<a href="{{url}}">({{ pres.document.name }}) </a>
</td>
{% if can_manage_materials %}
<td class="col-md-2">
@ -110,12 +102,8 @@
{% for pres in session.filtered_drafts %}
<tr>
<td>
{% if pres.rev %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
{% else %}
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
{% endif %}
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %})</a>
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}) {% if pres.rev %}Version {{pres.rev}}{% endif %}</a>
</td>
{% if can_manage_materials %}
<td class="col-md-2">