Show all sessions associated with a document.

Remove the day/seq urls from the materials tree.
Allow sessionpresentation.rev to be None, meaning "current version".
Streamlined workflows to focus on current versions of a draft as a default.
Allow adding and editing sessionpresentations when looking at a specific document.
Allow adding drafts when looking at a specific session.
Add the meeting tab to 'team' groups.
Refactored several utility classes and expanded on factories.
Fixes ietf-tools#1908 and ietf-tools#1910.
Commit ready for merge.
 - Legacy-Id: 10856

Author: rjsparks

ietf/doc/factories.py

@@ -0,0 +1,45 @@
+import factory
+
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent
+from ietf.person.factories import PersonFactory
+
+class DocumentFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = Document
+
+    type_id = 'draft'
+    title = factory.Faker('sentence',nb_words=6)
+    rev = '00'
+    group = None
+
+    @factory.lazy_attribute_sequence
+    def name(self, n):
+        return '%s-%s-%s-%s%d'%( 
+              self.type_id,
+              'bogusperson',
+              self.group.acronym if self.group else 'netherwhere',
+              'musings',
+              n,
+            )
+
+    newrevisiondocevent = factory.RelatedFactory('ietf.doc.factories.NewRevisionDocEventFactory','doc')
+
+class DocEventFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = DocEvent
+
+    type = 'added_comment'
+    by = factory.SubFactory(PersonFactory)
+    doc = factory.SubFactory(DocumentFactory)
+    desc = factory.Faker('sentence',nb_words=6)
+
+class NewRevisionDocEventFactory(DocEventFactory):
+    class Meta:
+        model = NewRevisionDocEvent
+
+    type = 'new_revision'
+    rev = '00'
+
+    @factory.lazy_attribute
+    def desc(self):
+         return 'New version available %s-%s'%(self.doc.name,self.rev)

ietf/doc/tests.py

@@ -20,10 +20,14 @@
 from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
     DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, NewRevisionDocEvent,
     save_document_in_history )
+from ietf.doc.factories import DocumentFactory
 from ietf.group.models import Group
+from ietf.group.factories import GroupFactory
 from ietf.meeting.models import Meeting, Session, SessionPresentation
+from ietf.meeting.factories import SessionFactory
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
+from ietf.person.factories import PersonFactory
 from ietf.utils.mail import outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized, unicontent
@@ -904,3 +908,185 @@ def testExpansions(self):
         self.assertEqual(r.status_code, 200)
         self.assertTrue('draft-ietf-mars-test.all@ietf.org' in unicontent(r))
         self.assertTrue('ballot_saved' in unicontent(r))
+
+class DocumentMeetingTests(TestCase):
+
+    def setUp(self):
+        self.group = GroupFactory(type_id='wg',state_id='active')
+        self.group_chair = PersonFactory()
+        self.group.role_set.create(name_id='chair',person=self.group_chair,email=self.group_chair.email())
+
+        self.other_group = GroupFactory(type_id='wg',state_id='active')
+        self.other_chair = PersonFactory()
+        self.other_group.role_set.create(name_id='chair',person=self.other_chair,email=self.other_chair.email())
+
+        today = datetime.date.today()
+        cut_days = settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS
+        self.past_cutoff = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1+cut_days))
+        self.past = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=cut_days/2))
+        self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1))
+        self.future = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today+datetime.timedelta(days=90))
+        self.interim = SessionFactory.create(meeting__type_id='interim',group=self.group,meeting__date=today+datetime.timedelta(days=45))
+
+    def test_view_document_meetings(self):
+        doc = DocumentFactory.create()
+        doc.sessionpresentation_set.create(session=self.inprog,rev=None)
+        doc.sessionpresentation_set.create(session=self.interim,rev=None)
+
+        url = urlreverse('ietf.doc.views_doc.all_presentations', kwargs=dict(name=doc.name))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertTrue(all([q(id) for id in ['#inprogressmeets','#futuremeets']]))
+        self.assertFalse(any([q(id) for id in ['#pastmeets',]]))
+        self.assertFalse(q('#addsessionsbutton'))
+        self.assertFalse(q("a.btn:contains('Remove document')"))
+
+        doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
+        doc.sessionpresentation_set.create(session=self.past,rev=None)
+
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertTrue(q('#addsessionsbutton'))
+        self.assertEqual(1,len(q("#inprogressmeets a.btn-default:contains('Remove document')")))
+        self.assertEqual(1,len(q("#futuremeets a.btn-default:contains('Remove document')")))
+        self.assertEqual(1,len(q("#pastmeets a.btn-default:contains('Remove document')")))
+        self.assertEqual(1,len(q("#pastmeets a.btn-warning:contains('Remove document')")))
+
+        self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertTrue(q('#addsessionsbutton'))
+        self.assertEqual(1,len(q("#inprogressmeets a.btn-default:contains('Remove document')")))
+        self.assertEqual(1,len(q("#futuremeets a.btn-default:contains('Remove document')")))
+        self.assertEqual(1,len(q("#pastmeets a.btn-default:contains('Remove document')")))
+        self.assertTrue(q('#pastmeets'))
+        self.assertFalse(q("#pastmeets a.btn-warning:contains('Remove document')"))
+
+        self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertTrue(q('#addsessionsbutton'))
+        self.assertTrue(all([q(id) for id in ['#futuremeets','#pastmeets','#inprogressmeets']]))
+        self.assertFalse(q("#inprogressmeets a.btn:contains('Remove document')"))
+        self.assertFalse(q("#futuremeets a.btn:contains('Remove document')"))
+        self.assertFalse(q("#pastmeets a.btn:contains('Remove document')"))
+
+    def test_edit_document_session(self):
+        doc = DocumentFactory.create()
+        sp = doc.sessionpresentation_set.create(session=self.future,rev=None)
+
+        url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=0))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+        
+        self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertEqual(2,len(q('select#id_version option')))
+
+        self.assertEqual(1,doc.docevent_set.count())
+        response = self.client.post(url,{'version':'00','save':''})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(doc.sessionpresentation_set.get(pk=sp.pk).rev,'00')
+        self.assertEqual(2,doc.docevent_set.count())
+
+    def test_edit_document_session_after_proceedings_closed(self):
+        doc = DocumentFactory.create()
+        sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
+
+        url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
+        self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+        
+        self.client.login(username='secretary',password='secretary+password')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q=PyQuery(response.content)
+        self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')")))
+
+    def test_remove_document_session(self):
+        doc = DocumentFactory.create()
+        sp = doc.sessionpresentation_set.create(session=self.future,rev=None)
+
+        url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=0))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+        self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+        
+        self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        self.assertEqual(1,doc.docevent_set.count())
+        response = self.client.post(url,{'remove_session':''})
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(doc.sessionpresentation_set.filter(pk=sp.pk).exists())
+        self.assertEqual(2,doc.docevent_set.count())
+
+    def test_remove_document_session_after_proceedings_closed(self):
+        doc = DocumentFactory.create()
+        sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
+
+        url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
+        self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+        
+        self.client.login(username='secretary',password='secretary+password')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q=PyQuery(response.content)
+        self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')")))
+
+    def test_add_document_session(self):
+        doc = DocumentFactory.create()
+
+        url = urlreverse('ietf.doc.views_doc.add_sessionpresentation',kwargs=dict(name=doc.name))
+        login_testing_unauthorized(self,self.group_chair.user.username,url)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code,200)
+    
+        response = self.client.post(url,{'session':0,'version':'current'})
+        self.assertEqual(response.status_code,200)
+        q=PyQuery(response.content)
+        self.assertTrue(q('.form-group.has-error'))
+     
+        response = self.client.post(url,{'session':self.future.pk,'version':'bogus version'})
+        self.assertEqual(response.status_code,200)
+        q=PyQuery(response.content)
+        self.assertTrue(q('.form-group.has-error'))
+
+        self.assertEqual(1,doc.docevent_set.count())
+        response = self.client.post(url,{'session':self.future.pk,'version':'current'})
+        self.assertEqual(response.status_code,302)
+        self.assertEqual(2,doc.docevent_set.count())

ietf/doc/tests_material.py

@@ -6,19 +6,19 @@
 from StringIO import StringIO
 from pyquery import PyQuery
 
+import debug              # pyflakes:ignore
+
 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
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 from ietf.utils.test_data import make_test_data
 
-from ietf.meeting.test_data import make_meeting_test_data
 
 class GroupMaterialTests(TestCase):
     def setUp(self):
@@ -173,67 +173,3 @@ def test_revise(self):
         with open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")) as f:
             self.assertEqual(f.read(), content)
 
-    def test_material_presentations(self):
-        doc = self.create_slides()
-        meeting = make_meeting_test_data()
-        meeting.session_set.filter(group__acronym='mars').update(group=doc.group)
-
-        url = urlreverse(material_presentations,kwargs=dict(name=doc.name))
-        login_testing_unauthorized(self, "secretary", url)
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        url = urlreverse(material_presentations,kwargs=dict(name=doc.name,seq=1))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        when = meeting.agenda.assignments.filter(session__group__acronym='testteam').first().timeslot.time
-        mdw = when.date().isoformat()
-        dow = ['mon','tue','wed','thu','fri','sat','sun'][when.weekday()]
-
-        for kw in [ dict(),
-                    dict(seq=1),
-                    dict(week_day=dow),
-                    dict(week_day=dow,seq=1),
-                    dict(date=mdw),
-                    dict(date=mdw,seq=1),
-                    dict(date=mdw+'-0930'),
-                    dict(date=mdw+'-0930',seq=1),
-                   ]:
-            kw['name'] = doc.name
-            kw['acronym'] = 'testteam'
-            url = urlreverse(material_presentations,kwargs=kw)
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-
-    def test_edit_material_presentations(self):
-        doc = self.create_slides()
-        meeting = make_meeting_test_data()
-        meeting.session_set.filter(group__acronym='mars').update(group=doc.group)
-
-        session = meeting.agenda.assignments.filter(session__group__acronym='testteam').first().session
-
-        url = urlreverse(edit_material_presentations,kwargs=dict(name=doc.name,acronym='testteam',seq=1))
-        login_testing_unauthorized(self, "secretary", url)
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        
-        self.assertEqual(doc.sessionpresentation_set.count(),0)
-
-        # add the materials to a session
-        r = self.client.post(url, dict(action="Save",version="00"))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(doc.sessionpresentation_set.first().session , session) 
-
-        # change the version
-        r = self.client.post(url, dict(action="Save",version="01"))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(doc.sessionpresentation_set.first().session , session) 
-
-        # take the slides back off that meeting
-        r = self.client.post(url, dict(action="Save",version="notpresented"))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(doc.sessionpresentation_set.count(),0)
-        
-

ietf/doc/urls.py

@@ -37,6 +37,12 @@
 from ietf.doc import views_status_change
 from ietf.doc import views_doc
 
+session_patterns = [
+    url(r'^add$', views_doc.add_sessionpresentation),
+    url(r'^(?P<session_id>\d+)/edit$',  views_doc.edit_sessionpresentation),
+    url(r'^(?P<session_id>\d+)/remove$', views_doc.remove_sessionpresentation),
+]
+
 urlpatterns = patterns('',
     (r'^/?$', views_search.search),
     url(r'^(?P<name>[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name, name="doc_search_for_name"),
@@ -112,5 +118,7 @@
     (r'^(?P<name>charter-[A-Za-z0-9._+-]+)/', include('ietf.doc.urls_charter')),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/conflict-review/', include('ietf.doc.urls_conflict_review')),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/status-change/', include('ietf.doc.urls_status_change')),
+    url(r'^(?P<name>[A-Za-z0-9._+-]+)/meetings$', 'ietf.doc.views_doc.all_presentations', name="all_presentations"),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/material/', include('ietf.doc.urls_material')),
+    url(r'^(?P<name>[A-Za-z0-9._+-]+)/session/', include(session_patterns)),
 )

ietf/doc/urls_material.py

@@ -2,20 +2,5 @@
 
 urlpatterns = patterns('ietf.doc.views_material',
     url(r'^(?P<action>state|title|abstract|revise)/$', "edit_material", name="material_edit"),
-    url(r'^sessions/$', "material_presentations", name="material_presentations"),
-    (r'^sessions/(?P<seq>\d+)/edit/$',  "edit_material_presentations"),
-    (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"),
 )