From bd0b166ca026ebd515fef0d272aab9ac7be33f39 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Tue, 23 Feb 2016 16:30:54 +0000
Subject: [PATCH] Show which session the user is adding drafts to when there
 was more than one sesison at a meeting.  - Legacy-Id: 10854

---
 ietf/doc/tests_material.py                     |  1 -
 ietf/meeting/views.py                          | 14 ++++++++++++--
 ietf/templates/meeting/add_session_drafts.html |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index f16858cb4..3d84ff315 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -12,7 +12,6 @@ from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent
-#from ietf.doc.views_material import material_presentations, edit_material_presentations
 from ietf.group.models import Group
 from ietf.meeting.models import Meeting, Session, SessionPresentation
 from ietf.name.models import SessionStatusName
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index a67040835..d01ee3e32 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -828,7 +828,7 @@ def meeting_requests(request, num=None):
         {"meeting": meeting, "sessions":sessions,
          "groups_not_meeting": groups_not_meeting})
 
-def session_details(request, num, acronym ):
+def get_sessions(num, acronym):
     meeting = get_meeting(num=num,type_in=None)
     sessions = Session.objects.filter(meeting=meeting,group__acronym=acronym,type__in=['session','plenary','other'])
 
@@ -842,7 +842,11 @@ def session_details(request, num, acronym ):
         else:
             return session.requested
 
-    sessions = sorted(sessions,key=sort_key)
+    return sorted(sessions,key=sort_key)
+
+def session_details(request, num, acronym ):
+    meeting = get_meeting(num=num,type_in=None)
+    sessions = get_sessions(num, acronym)
 
     if not sessions:
         raise Http404
@@ -901,6 +905,11 @@ def add_session_drafts(request, session_id, num):
 
     already_linked = [sp.document for sp in session.sessionpresentation_set.filter(document__type_id='draft')]
 
+    session_number = None
+    sessions = get_sessions(session.meeting.number,session.group.acronym)
+    if len(sessions) > 1:
+       session_number = 1 + sessions.index(session)
+
     if request.method == 'POST':
         form = SessionDraftsForm(request.POST,already_linked=already_linked)
         if form.is_valid():
@@ -915,6 +924,7 @@ def add_session_drafts(request, session_id, num):
 
     return render(request, "meeting/add_session_drafts.html",
                   { 'session': session,
+                    'session_number': session_number,
                     'already_linked': session.sessionpresentation_set.filter(document__type_id='draft'),
                     'form': form,
                   })
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index 3fa968f00..4b4b2ca2b 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% origin %}
 
-  <h1>Add drafts to  {{ session.meeting }} : {{ session.group.acronym }}</h1>
+  <h1>Add drafts to  {{ session.meeting }} {% if session_number %}: Session {{session_number}}{% endif %} : {{ session.group.acronym }}{% if session.name %} : {{session.name}}{% endif %}</h1>
   {% comment %} TODO: put the session name here or calculate the number at the meeting {% endcomment %}
 
   {% if session.is_material_submission_cutoff %}