From 986768bf73910aec3d714154d3ce971c3831acf9 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Mon, 24 Nov 2014 21:06:58 +0000
Subject: [PATCH] Cleaned up issues with date and weekday variants of the
 session views  - Legacy-Id: 8707

---
 ietf/doc/urls_material.py                               | 2 ++
 ietf/doc/views_material.py                              | 2 ++
 ietf/templates/doc/material/material_presentations.html | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ietf/doc/urls_material.py b/ietf/doc/urls_material.py
index d61b5faaf..40fb7fd6c 100644
--- a/ietf/doc/urls_material.py
+++ b/ietf/doc/urls_material.py
@@ -7,12 +7,14 @@ urlpatterns = patterns('ietf.doc.views_material',
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/edit/$',  "edit_material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/edit/$',  "edit_material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/edit/$',  "edit_material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
     (r'^sessions/(?P<seq>\d+)/$',  "material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',  "material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/$',  "material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/(?P<seq>\d+)/$',  "material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$',  "material_presentations"),
     (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$',  "material_presentations"),
 )
diff --git a/ietf/doc/views_material.py b/ietf/doc/views_material.py
index 29ed7e48c..0f2c6b374 100644
--- a/ietf/doc/views_material.py
+++ b/ietf/doc/views_material.py
@@ -317,4 +317,6 @@ def material_presentations(request, name, acronym=None, date=None, seq=None, wee
     return render(request, 'doc/material/material_presentations.html', {
         'sessions' : sorted_sessions,
         'doc': doc,
+        'date': date,
+        'week_day': week_day,
         })
diff --git a/ietf/templates/doc/material/material_presentations.html b/ietf/templates/doc/material/material_presentations.html
index fd093e269..02cb1cb1d 100644
--- a/ietf/templates/doc/material/material_presentations.html
+++ b/ietf/templates/doc/material/material_presentations.html
@@ -18,7 +18,13 @@ Upcoming Presentations
         {% for group in group_list %}
             {% for session in group.list %}
               <li> 
-                   <a href="{% url 'ietf.doc.views_material.edit_material_presentations' name=doc.name acronym=group.grouper.acronym seq=forloop.counter %}">{{ session }}</a>
+                   {% if week_day %}
+                     <a href="{% url 'ietf.doc.views_material.edit_material_presentations' name=doc.name acronym=group.grouper.acronym seq=forloop.counter week_day=week_day %}">{{ session }}</a>
+                   {% elif date %}
+                     <a href="{% url 'ietf.doc.views_material.edit_material_presentations' name=doc.name acronym=group.grouper.acronym seq=forloop.counter date=date %}">{{ session }}</a>
+                   {% else %}
+                     <a href="{% url 'ietf.doc.views_material.edit_material_presentations' name=doc.name acronym=group.grouper.acronym seq=forloop.counter %}">{{ session }}</a>
+                   {% endif %}
                    {% if session.versions %} (version{{session.versions|pluralize}} {{session.versions|join:','}}) {% endif %}
               </li>
             {% endfor %}