Merged in [16102] from rjsparks@nostrum.com:

    Allow logged in users to propose slides for meeting sessions. Fixes ietf-tools#2547 and ietf-tools#2403.
 - Legacy-Id: 16118
Note: SVN reference [16102] has been migrated to Git commit becad91

Author: levkowetz

ietf/mailtrigger/migrations/0005_slides_proposed.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-03-25 06:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
+    Recipient = apps.get_model('mailtrigger', 'Recipient')
+
+    changed = MailTrigger.objects.create(
+        slug = 'slides_proposed',
+        desc = 'Recipients when slides are proposed for a given session',
+    )
+    changed.to.set(Recipient.objects.filter(slug__in=['group_chairs', 'group_responsible_directors', 'group_secretaries']))
+
+def reverse(apps, schema_editor):
+    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
+    MailTrigger.objects.filter(slug='slides_proposed').delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0004_ballot_rfceditornote_changed_postapproval'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse)
+    ]

ietf/meeting/admin.py

@@ -2,7 +2,7 @@
 
 from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
-    SessionPresentation, ImportantDate, )
+    SessionPresentation, ImportantDate, SlideSubmission, )
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -129,6 +129,9 @@ class SessionPresentationAdmin(admin.ModelAdmin):
 class ImportantDateAdmin(admin.ModelAdmin):
     model = ImportantDate
     list_display = ['meeting', 'name', 'date']
-
-
 admin.site.register(ImportantDate,ImportantDateAdmin)
+
+class SlideSubmissionAdmin(admin.ModelAdmin):
+    model = SlideSubmission
+    list_display = ['session', 'submitter', 'title']
+admin.site.register(SlideSubmission, SlideSubmissionAdmin)

ietf/meeting/factories.py

@@ -4,7 +4,7 @@
 
 from django.core.files.base import ContentFile
 
-from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation, FloorPlan, Room
+from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation, FloorPlan, Room, SlideSubmission
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
 
@@ -157,3 +157,16 @@ class Meta:
                 ), 'floorplan.jpg'
             )
         )
+
+class SlideSubmissionFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = SlideSubmission
+
+    session = factory.SubFactory(SessionFactory)
+    title = factory.Faker('sentence')
+    filename = factory.Sequence(lambda n: 'test_slide_%d'%n)
+    submitter = factory.SubFactory(PersonFactory)
+
+    make_file = factory.PostGeneration(
+                    lambda obj, create, extracted, **kwargs: open(obj.staged_filepath(),'a').close()
+                )

ietf/meeting/migrations/0012_add_slide_submissions.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-03-23 07:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0009_auto_20190118_0725'),
+        ('meeting', '0011_auto_20190114_0550'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SlideSubmission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('filename', models.CharField(max_length=255)),
+                ('apply_to_all', models.BooleanField(default=False)),
+                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+                ('submitter', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+        ),
+    ]

ietf/meeting/models.py

@@ -1152,3 +1152,16 @@ class Meta:
 
     def __unicode__(self):
         return u'%s : %s : %s' % ( self.meeting, self.name, self.date )
+
+class SlideSubmission(models.Model):
+    session = ForeignKey(Session)
+    title = models.CharField(max_length=255)
+    filename = models.CharField(max_length=255)
+    apply_to_all = models.BooleanField(default=False)
+    submitter = ForeignKey(Person)
+
+    def staged_filepath(self):
+        return os.path.join(settings.SLIDE_STAGING_PATH , self.filename)
+
+    def staged_url(self):
+        return "".join([settings.SLIDE_STAGING_URL, self.filename])

ietf/meeting/resources.py

@@ -9,7 +9,7 @@
 
 from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room, Schedule, Session,
                                 TimeSlot, SchedTimeSessAssignment, SessionPresentation, FloorPlan,
-                                UrlResource, ImportantDate )
+                                UrlResource, ImportantDate, SlideSubmission )
 
 from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
@@ -301,3 +301,23 @@ class Meta:
             "name": ALL_WITH_RELATIONS,
         }
 api.meeting.register(ImportantDateResource())
+
+
+from ietf.person.resources import PersonResource
+class SlideSubmissionResource(ModelResource):
+    session          = ToOneField(SessionResource, 'session')
+    submitter        = ToOneField(PersonResource, 'submitter')
+    class Meta:
+        queryset = SlideSubmission.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'slidesubmission'
+        filtering = { 
+            "id": ALL,
+            "title": ALL,
+            "filename": ALL,
+            "apply_to_all": ALL,
+            "session": ALL_WITH_RELATIONS,
+            "submitter": ALL_WITH_RELATIONS,
+        }
+api.meeting.register(SlideSubmissionResource())

ietf/meeting/tests_views.py

@@ -26,7 +26,7 @@
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_cancellation_notice
 from ietf.meeting.helpers import send_interim_minutes_reminder, populate_important_dates, update_important_dates
-from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation
+from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation, SlideSubmission
 from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting
 from ietf.meeting.utils import finalize
 from ietf.name.models import SessionStatusName, ImportantDateName
@@ -35,9 +35,9 @@
 from ietf.utils.text import xslugify
 
 from ietf.person.factories import PersonFactory
-from ietf.group.factories import GroupFactory, GroupEventFactory
+from ietf.group.factories import GroupFactory, GroupEventFactory, RoleFactory
 from ietf.meeting.factories import ( SessionFactory, SessionPresentationFactory, ScheduleFactory,
-    MeetingFactory, FloorPlanFactory, TimeSlotFactory )
+    MeetingFactory, FloorPlanFactory, TimeSlotFactory, SlideSubmissionFactory )
 from ietf.doc.factories import DocumentFactory
 from ietf.submit.tests import submission_file
 
@@ -1721,13 +1721,17 @@ class MaterialsTests(TestCase):
 
     def setUp(self):
         self.materials_dir = self.tempdir('materials')
+        self.staging_dir = self.tempdir('staging')
         if not os.path.exists(self.materials_dir):
             os.mkdir(self.materials_dir)
         self.saved_agenda_path = settings.AGENDA_PATH
         settings.AGENDA_PATH = self.materials_dir
+        self.saved_staging_path = settings.SLIDE_STAGING_PATH
+        settings.SLIDE_STAGING_PATH = self.staging_dir
 
     def tearDown(self):
         settings.AGENDA_PATH = self.saved_agenda_path
+        settings.SLIDE_STAGING_PATH = self.saved_staging_path
         shutil.rmtree(self.materials_dir)
 
     def crawl_materials(self, url, top):
@@ -2019,6 +2023,116 @@ def test_remove_sessionpresentation(self):
         self.assertEqual(0,session.sessionpresentation_set.count())
         self.assertEqual(2,doc.docevent_set.count())
 
+    def test_propose_session_slides(self):
+        for type_id in ['ietf','interim']:
+            session = SessionFactory(meeting__type_id=type_id)
+            chair = RoleFactory(group=session.group,name_id='chair').person
+            session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+            newperson = PersonFactory()
+            
+            session_overview_url = urlreverse('ietf.meeting.views.session_details',kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
+            propose_url = urlreverse('ietf.meeting.views.propose_session_slides', kwargs={'session_id':session.pk, 'num': session.meeting.number})    
+
+            r = self.client.get(session_overview_url)
+            self.assertEqual(r.status_code,200)
+            q = PyQuery(r.content)
+            self.assertFalse(q('#uploadslides'))
+            self.assertFalse(q('#proposeslides'))
+
+            self.client.login(username=newperson.user.username,password=newperson.user.username+"+password")
+            r = self.client.get(session_overview_url)
+            self.assertEqual(r.status_code,200)
+            q = PyQuery(r.content)
+            self.assertTrue(q('#proposeslides'))
+            self.client.logout()
+
+            login_testing_unauthorized(self,newperson.user.username,propose_url)
+            r = self.client.get(propose_url)
+            self.assertEqual(r.status_code,200)
+            test_file = StringIO('this is not really a slide')
+            test_file.name = 'not_really.txt'
+            empty_outbox()
+            r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+            self.assertEqual(r.status_code, 302)
+            session = Session.objects.get(pk=session.pk)
+            self.assertEqual(session.slidesubmission_set.count(),1)
+            self.assertEqual(len(outbox),1)
+
+            r = self.client.get(session_overview_url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('#proposedslidelist p')), 1)
+
+            SlideSubmissionFactory(session = session)
+
+            self.client.logout()
+            self.client.login(username=chair.user.username, password=chair.user.username+"+password")
+            r = self.client.get(session_overview_url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('#proposedslidelist p')), 2)
+            self.client.logout()
+
+    def test_disapprove_proposed_slides(self):
+        submission = SlideSubmissionFactory()
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        chair = RoleFactory(group=submission.session.group,name_id='chair').person
+        url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        r = self.client.post(url,dict(title='some title',disapprove="disapprove"))
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(SlideSubmission.objects.count(), 0)
+
+    def test_approve_proposed_slides(self):
+        submission = SlideSubmissionFactory()
+        session = submission.session
+        session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        chair = RoleFactory(group=submission.session.group,name_id='chair').person
+        url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        r = self.client.post(url,dict(title='different title',approve='approve'))
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(SlideSubmission.objects.count(), 0)
+        self.assertEqual(session.sessionpresentation_set.count(),1)
+        self.assertEqual(session.sessionpresentation_set.first().document.title,'different title')
+
+    def test_approve_proposed_slides_multisession_apply_one(self):
+        submission = SlideSubmissionFactory(session__meeting__type_id='ietf')
+        session1 = submission.session
+        session2 = SessionFactory(group=submission.session.group, meeting=submission.session.meeting)
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        chair = RoleFactory(group=submission.session.group,name_id='chair').person
+        url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('#id_apply_to_all'))
+        r = self.client.post(url,dict(title='yet another title',approve='approve'))
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(session1.sessionpresentation_set.count(),1)
+        self.assertEqual(session2.sessionpresentation_set.count(),0)
+
+    def test_approve_proposed_slides_multisession_apply_all(self):
+        submission = SlideSubmissionFactory(session__meeting__type_id='ietf')
+        session1 = submission.session
+        session2 = SessionFactory(group=submission.session.group, meeting=submission.session.meeting)
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        chair = RoleFactory(group=submission.session.group,name_id='chair').person
+        url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        r = self.client.post(url,dict(title='yet another title',apply_to_all=1,approve='approve'))
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(session1.sessionpresentation_set.count(),1)
+        self.assertEqual(session2.sessionpresentation_set.count(),1)
+
+
 class SessionTests(TestCase):
 
     def test_meeting_requests(self):

ietf/meeting/urls.py

@@ -13,11 +13,13 @@
     url(r'^session/(?P<session_id>\d+)/bluesheets$', views.upload_session_bluesheets),
     url(r'^session/(?P<session_id>\d+)/minutes$', views.upload_session_minutes),
     url(r'^session/(?P<session_id>\d+)/agenda$', views.upload_session_agenda),
+    url(r'^session/(?P<session_id>\d+)/propose_slides$', views.propose_session_slides),
     url(r'^session/(?P<session_id>\d+)/slides(?:/%(name)s)?$' % settings.URL_REGEXPS, views.upload_session_slides),
     url(r'^session/(?P<session_id>\d+)/slides/%(name)s/order$' % settings.URL_REGEXPS, views.set_slide_order),
     url(r'^session/(?P<session_id>\d+)/doc/%(name)s/remove$' % settings.URL_REGEXPS, views.remove_sessionpresentation),
     url(r'^session/(?P<session_id>\d+)\.ics$',    views.ical_agenda),
     url(r'^sessions/(?P<acronym>[-a-z0-9]+)\.ics$', views.ical_agenda),
+    url(r'^slidesubmission/(?P<slidesubmission_id>\d+)$', views.approve_proposed_slides)
 ]