Skip to content

Commit 1a35504

Browse files
committed
Merged in [16592] from rjsparks@nostrum.com:
Change how the session details page links to documents to not link to a specific version. Fixes ietf-tools#2758. See also ietf-tools#2756. - Legacy-Id: 16610 Note: SVN reference [16592] has been migrated to Git commit c6c086b
1 parent 2b1dd0f commit 1a35504

1 file changed

Lines changed: 6 additions & 18 deletions

File tree

ietf/templates/meeting/session_details_panel.html

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,10 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
2727
<table class="table table-condensed table-striped">
2828
{% for pres in session.filtered_artifacts %}
2929
<tr>
30-
{% if pres.rev %}
31-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
32-
{% else %}
33-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
34-
{% endif %}
30+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
3531
<td>
3632
<a href="{{pres.document.href}}">{{pres.document.title}}</a>
37-
<a href="{{url}}">({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %})</a>
33+
<a href="{{url}}">({{ pres.document.name }})</a>
3834
</td>
3935
{% if user|has_role:"Secretariat" or can_manage_materials %}
4036
<td class="col-md-2">
@@ -73,14 +69,10 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
7369
<tbody>
7470
{% for pres in session.filtered_slides %}
7571
<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 %}">
76-
{% if pres.rev %}
77-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
78-
{% else %}
79-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
80-
{% endif %}
72+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
8173
<td>
8274
<a href="{{pres.document.href}}">{{pres.document.title}} </a>
83-
<a href="{{url}}">({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %}) </a>
75+
<a href="{{url}}">({{ pres.document.name }}) </a>
8476
</td>
8577
{% if can_manage_materials %}
8678
<td class="col-md-2">
@@ -110,12 +102,8 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
110102
{% for pres in session.filtered_drafts %}
111103
<tr>
112104
<td>
113-
{% if pres.rev %}
114-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name rev=pres.rev as url %}
115-
{% else %}
116-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
117-
{% endif %}
118-
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}{% if pres.rev %}-{{ pres.rev }}{% endif %})</a>
105+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
106+
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}) {% if pres.rev %}Version {{pres.rev}}{% endif %}</a>
119107
</td>
120108
{% if can_manage_materials %}
121109
<td class="col-md-2">

0 commit comments

Comments
 (0)