From 1a355046936c9e7c71ff17296f22f4876bcfd0a9 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 1 Aug 2019 20:17:59 +0000
Subject: [PATCH] Merged in [16592] from rjsparks@nostrum.com:

    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
---
 .../meeting/session_details_panel.html        | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index f10cf46ff..9e8d88dd4 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -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">