Closed off the old paths for materials upload (redirecting some old entry points). Commit ready for merge.

 - Legacy-Id: 12000

Author: rjsparks

ietf/meeting/views.py

@@ -20,7 +20,7 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse,reverse_lazy
 from django.db.models import Min, Max
 from django.conf import settings
 from django.forms.models import modelform_factory, inlineformset_factory
@@ -30,6 +30,7 @@
 from django.views.decorators.cache import cache_page
 from django.utils.text import slugify
 from django.views.decorators.csrf import ensure_csrf_cookie
+from django.views.generic import RedirectView
 from django.template.defaultfilters import filesizeformat
 
 from ietf.doc.fields import SearchableDocumentsField
@@ -1989,3 +1990,6 @@ def proceedings_overview(request, num=None):
         'template': template,
     })
 
+class OldUploadRedirect(RedirectView):
+    def get_redirect_url(self, **kwargs):
+        return reverse_lazy('ietf.meeting.views.session_details',kwargs=self.kwargs)

ietf/secr/meetings/views.py

@@ -25,7 +25,8 @@
 from ietf.secr.meetings.forms import ( BaseMeetingRoomFormSet, MeetingModelForm,
     MeetingRoomForm, NewSessionForm, NonSessionEditForm, NonSessionForm, TimeSlotForm,
     UploadBlueSheetForm, get_next_slot )
-from ietf.secr.proceedings.views import build_choices, handle_upload_file
+from ietf.secr.proceedings.views import build_choices
+from ietf.secr.proceedings.utils import handle_upload_file
 from ietf.secr.sreq.forms import GroupSelectForm
 from ietf.secr.sreq.views import get_initial_session
 from ietf.secr.utils.meeting import get_session, get_timeslot

ietf/secr/proceedings/forms.py

@@ -1,11 +1,7 @@
-import os
 
 from django import forms
-from django.conf import settings
-from django.template.defaultfilters import filesizeformat
 
 from ietf.doc.models import Document
-from ietf.name.models import DocTypeName
 from ietf.meeting.models import Session
 
 
@@ -22,11 +18,6 @@
 # Forms
 #----------------------------------------------------------
 
-class EditSlideForm(forms.ModelForm):
-    class Meta:
-        model = Document
-        fields = ('title',)
-
 class RecordingForm(forms.Form):
     external_url = forms.URLField(label='Url')
     session = forms.ModelChoiceField(queryset=Session.objects,empty_label='')
@@ -46,66 +37,3 @@ def __init__(self, *args, **kwargs):
         super(RecordingEditForm, self).__init__(*args, **kwargs)
         self.fields['external_url'].label='Url'
 
-class ReplaceSlideForm(forms.ModelForm):
-    file = forms.FileField(label='Select File')
-    
-    class Meta:
-        model = Document
-        fields = ('title',)
-    
-    def clean_file(self):
-        file = self.cleaned_data.get('file')
-        ext = os.path.splitext(file.name)[1].lower()
-        if ext not in VALID_SLIDE_EXTENSIONS:
-            raise forms.ValidationError('Only these file types supported for presentation slides: %s' % ','.join(VALID_SLIDE_EXTENSIONS))
-        if file._size > settings.SECR_MAX_UPLOAD_SIZE:
-            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
-        return file
-
-class UnifiedUploadForm(forms.Form):
-    acronym = forms.CharField(widget=forms.HiddenInput())
-    meeting_id = forms.CharField(widget=forms.HiddenInput())
-    material_type = forms.ModelChoiceField(queryset=DocTypeName.objects.filter(slug__in=('minutes','agenda','slides','bluesheets')),empty_label=None)
-    slide_name = forms.CharField(label='Name of Presentation',max_length=255,required=False,help_text="For presentations only")
-    file = forms.FileField(label='Select File',help_text='<div id="id_file_help">Note 1: You can only upload a presentation file in txt, pdf, doc, or ppt/pptx. System will not accept presentation files in any other format.<br><br>Note 2: All uploaded files will be available to the public immediately on the Preliminary Page. However, for the Proceedings, ppt/pptx files will be converted to html format and doc files will be converted to pdf format manually by the Secretariat staff.</div>')
-    
-    def clean_file(self):
-        file = self.cleaned_data['file']
-        if file._size > settings.SECR_MAX_UPLOAD_SIZE:
-            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
-        return file
-        
-    def clean(self):
-        super(UnifiedUploadForm, self).clean()
-        # if an invalid file type is supplied no file attribute will exist
-        if self.errors:
-            return self.cleaned_data
-        cleaned_data = self.cleaned_data
-        material_type = cleaned_data['material_type']
-        slide_name = cleaned_data['slide_name']
-        file = cleaned_data['file']
-        ext = os.path.splitext(file.name)[1].lower()
-
-        if material_type.slug == 'slides' and not slide_name:
-            raise forms.ValidationError('ERROR: Name of Presentaion cannot be blank')
-        
-        # only supporting PDFs per Alexa 04-05-2011
-        #if material_type == 1 and not file_ext[1] == '.pdf': 
-        #        raise forms.ValidationError('Presentations must be a PDF file')
-       
-        # validate file extensions based on material type (slides,agenda,minutes,bluesheets)
-        # valid extensions per online documentation: meeting-materials.html
-        # 09-14-11 added ppt, pdf per Alexa
-        # 04-19-12 txt/html for agenda, +pdf for minutes per Russ
-        if material_type.slug == 'slides' and ext not in VALID_SLIDE_EXTENSIONS:
-            raise forms.ValidationError('Only these file types supported for presentation slides: %s' % ','.join(VALID_SLIDE_EXTENSIONS))
-        if material_type.slug == 'agenda' and ext not in VALID_AGENDA_EXTENSIONS:
-            raise forms.ValidationError('Only these file types supported for agendas: %s' % ','.join(VALID_AGENDA_EXTENSIONS))
-        if material_type.slug == 'minutes' and ext not in VALID_MINUTES_EXTENSIONS:
-            raise forms.ValidationError('Only these file types supported for minutes: %s' % ','.join(VALID_MINUTES_EXTENSIONS))
-        if material_type.slug == 'bluesheets' and ext not in VALID_BLUESHEET_EXTENSIONS:
-            raise forms.ValidationError('Only these file types supported for bluesheets: %s' % ','.join(VALID_BLUESHEET_EXTENSIONS))
-            
-        return cleaned_data
-
-        

ietf/secr/proceedings/tests.py

@@ -2,20 +2,19 @@
 import os
 import shutil
 
-from StringIO import StringIO
-
-from django.core.urlresolvers import reverse
 from django.conf import settings
+from django.core.urlresolvers import reverse
 
-from ietf.doc.models import Document
 from ietf.group.models import Group
-from ietf.meeting.models import Meeting, Session
+from ietf.meeting.models import Session
 from ietf.meeting.test_data import make_meeting_test_data
 from ietf.utils.test_data import make_test_data
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 
 from ietf.name.models import SessionStatusName
-from ietf.secr.utils.meeting import get_proceedings_path
+from ietf.meeting.factories import SessionFactory
+
+from ietf.secr.proceedings.proc_utils import create_proceedings
 
 SECR_USER='secretary'
 
@@ -64,47 +63,23 @@ def test_post(self):
         self.assertEqual(response.status_code, 200)
         self.failUnless(external_url in response.content)
 
-
-class BluesheetTestCase(TestCase):
+class OldProceedingsTestCase(TestCase):
+    ''' Ensure coverage of fragments of old proceedings generation until those are removed ''' 
     def setUp(self):
+        self.session = SessionFactory(meeting__type_id='ietf')
         self.proceedings_dir = os.path.abspath("tmp-proceedings-dir")
-        if not os.path.exists(self.proceedings_dir):
-            os.mkdir(self.proceedings_dir)
+
+        # This unintuitive bit is a consequence of the surprising implementation of meeting.get_materials_path
         self.saved_agenda_path = settings.AGENDA_PATH
-        settings.AGENDA_PATH = self.proceedings_dir
-        
-        self.interim_listing_dir = os.path.abspath("tmp-interim-listing-dir")
-        if not os.path.exists(self.interim_listing_dir):
-            os.mkdir(self.interim_listing_dir)
-        self.saved_secr_interim_listing_dir = settings.SECR_INTERIM_LISTING_DIR
-        settings.SECR_INTERIM_LISTING_DIR = self.interim_listing_dir
-        
+        settings.AGENDA_PATH= self.proceedings_dir
+
+        target_path = self.session.meeting.get_materials_path()
+        if not os.path.exists(target_path):
+            os.makedirs(target_path)
+
     def tearDown(self):
-        settings.AGENDA_PATH = self.saved_agenda_path
         shutil.rmtree(self.proceedings_dir)
-        settings.SECR_INTERIM_LISTING_DIR = self.saved_secr_interim_listing_dir
-        shutil.rmtree(self.interim_listing_dir)
-        
-    def test_upload(self):
-        make_meeting_test_data()
-        meeting = Meeting.objects.filter(type='interim',session__status='sched').first()
-        #self.assertTrue(meeting)
-        group = Group.objects.get(acronym='mars')
-        #Session.objects.create(meeting=meeting,group=group,requested_by_id=1,status_id='sched',type_id='session')
-        url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'acronym':'mars'})
-        upfile = StringIO('dummy file')
-        upfile.name = "scan1.pdf"
-        self.client.login(username="marschairman", password="marschairman+password")
-        r = self.client.post(url,
-            dict(acronym='mars',meeting_id=meeting.id,material_type='bluesheets',file=upfile),follow=True)
-        self.assertEqual(r.status_code, 200)
-        doc = Document.objects.get(type='bluesheets')
-        self.failUnless(doc.external_url in unicontent(r))
-        self.failUnless(os.path.exists(os.path.join(doc.get_file_path(),doc.external_url)))
-        # test that proceedings has bluesheets on it
-        path = get_proceedings_path(meeting,group)
-        self.failUnless(os.path.exists(path))
-        with open(path) as f:
-            data = f.read()
-        self.failUnless(doc.external_url.encode('utf-8') in data)
-        
+        settings.AGENDA_PATH = self.saved_agenda_path
+
+    def test_old_generate(self):
+        create_proceedings(self.session.meeting,self.session.group,is_final=True)

ietf/secr/proceedings/urls.py

@@ -1,26 +1,16 @@
 from django.conf.urls import patterns, url
 from django.conf import settings
+from ietf.meeting.views import OldUploadRedirect
 
 urlpatterns = patterns('ietf.secr.proceedings.views',
     url(r'^$', 'main', name='proceedings'),
     url(r'^ajax/generate-proceedings/(?P<meeting_num>\d{1,3})/$', 'ajax_generate_proceedings', name='proceedings_ajax_generate_proceedings'),
-    url(r'^ajax/order-slide/$', 'ajax_order_slide', name='proceedings_ajax_order_slide'),
     # special offline URL for testing proceedings build
-    url(r'^build/(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<acronym>[-a-z0-9]+)/$',
-        'build', name='proceedings_build'),
-    url(r'^delete/(?P<slide_id>[A-Za-z0-9._\-\+]+)/$', 'delete_material', name='proceedings_delete_material'),
-    url(r'^edit-slide/(?P<slide_id>[A-Za-z0-9._\-\+]+)/$', 'edit_slide', name='proceedings_edit_slide'),
-    url(r'^move-slide/(?P<slide_id>[A-Za-z0-9._\-\+]+)/(?P<direction>(up|down))/$',
-        'move_slide', name='proceedings_move_slide'),
     url(r'^process-pdfs/(?P<meeting_num>\d{1,3})/$', 'process_pdfs', name='proceedings_process_pdfs'),
     url(r'^progress-report/(?P<meeting_num>\d{1,3})/$', 'progress_report', name='proceedings_progress_report'),
-    url(r'^replace-slide/(?P<slide_id>[A-Za-z0-9._\-\+]+)/$', 'replace_slide', name='proceedings_replace_slide'),
     url(r'^(?P<meeting_num>\d{1,3})/$', 'select', name='proceedings_select'),
     url(r'^(?P<meeting_num>\d{1,3})/recording/$', 'recording', name='proceedings_recording'),
     url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', 'recording_edit', name='proceedings_recording_edit'),
-    # NOTE: we have two entries here which both map to upload_unified, passing session_id or acronym
-    url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<session_id>\d{1,6})/$',
-        'upload_unified', name='proceedings_upload_unified'),
-    url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
-        'upload_unified', name='proceedings_upload_unified'),
+    url(r'^(?P<num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
+         OldUploadRedirect.as_view()),
 )