Change how the session details page links to documents to not link to…

… a specific version. Fixes #2758. See also #2756. Commit ready for merge. - Legacy-Id: 16592
ietf-tools · Jul 26, 2019 · c6c086b · c6c086b
1 parent e89f200
commit c6c086b
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
@@ -27,14 +27,10 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
         <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 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
          <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 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
           {% 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">