Move the document upload wizard to the sources app

apps/documents/__init__.py

@@ -53,7 +53,6 @@ def is_current_version(context):
 
 document_list = {'text': _(u'all documents'), 'view': 'document_list', 'famfam': 'page'}
 document_list_recent = {'text': _(u'recent documents'), 'view': 'document_list_recent', 'famfam': 'page'}
-document_create_multiple = {'text': _(u'upload new documents'), 'view': 'document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']}
 document_create_siblings = {'text': _(u'clone metadata'), 'view': 'document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
 document_view_simple = {'text': _(u'details'), 'view': 'document_view_simple', 'args': 'object.id', 'famfam': 'page', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_view_advanced = {'text': _(u'properties'), 'view': 'document_view_advanced', 'args': 'object.id', 'famfam': 'page_gear', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
@@ -128,9 +127,9 @@ register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_ins
 # Document Version links
 register_links(DocumentVersion, [document_version_revert, document_version_download])
 
-secondary_menu_links = [document_list_recent, document_list, document_create_multiple]
+secondary_menu_links = [document_list_recent, document_list]
 
-register_links(['document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
+register_links(['document_list_recent', 'document_list', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
 register_links(Document, secondary_menu_links, menu_name='secondary_menu')
 
 # Document page links

apps/documents/urls.py

@@ -8,7 +8,6 @@ from .conf.settings import (PREVIEW_SIZE, PRINT_SIZE, THUMBNAIL_SIZE,
 urlpatterns = patterns('documents.views',
     url(r'^list/$', 'document_list', (), 'document_list'),
     url(r'^list/recent/$', 'document_list_recent', (), 'document_list_recent'),
-    url(r'^create/from/local/multiple/$', 'document_create', (), 'document_create_multiple'),
 
     url(r'^(?P<document_id>\d+)/view/$', 'document_view', (), 'document_view_simple'),
     url(r'^(?P<document_id>\d+)/view/advanced/$', 'document_view', {'advanced': True}, 'document_view_advanced'),

apps/documents/views.py

@@ -26,7 +26,6 @@ from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
     DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE
 from converter.office_converter import OfficeConverter
 from filetransfers.api import serve_file
-from metadata.forms import MetadataFormSet, MetadataSelectionForm
 from navigation.utils import resolve_to_name
 from permissions.models import Permission
 from document_indexing.api import update_indexes, delete_indexes
@@ -44,14 +43,12 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
     PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE,
     PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW)
 from .events import history_document_edited
-from .forms import (DocumentTypeSelectForm,
-        DocumentForm_edit, DocumentPropertiesForm,
+from .forms import (DocumentForm_edit, DocumentPropertiesForm,
         DocumentPreviewForm, DocumentPageForm,
         DocumentPageTransformationForm, DocumentContentForm,
         DocumentPageForm_edit, DocumentPageForm_text, PrintForm,
         DocumentTypeForm, DocumentTypeFilenameForm,
         DocumentTypeFilenameForm_create, DocumentDownloadForm)
-from .wizards import DocumentCreateWizard
 from .models import (Document, DocumentType, DocumentPage,
     DocumentPageTransformation, RecentDocument, DocumentTypeFilename,
     DocumentVersion)
@@ -85,14 +82,6 @@ def document_list(request, object_list=None, title=None, extra_context=None):
         context_instance=RequestContext(request))
 
 
-def document_create(request):
-    Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_CREATE])
-
-    wizard = DocumentCreateWizard(form_list=[DocumentTypeSelectForm, MetadataSelectionForm, MetadataFormSet])
-
-    return wizard(request)
-
-
 def document_create_siblings(request, document_id):
     Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_CREATE])
 

apps/documents/wizards.py

@@ -1,83 +0,0 @@
-from __future__ import absolute_import
-
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
-from django.utils.http import urlencode
-
-from common.wizard import BoundFormWizard
-
-from metadata.forms import MetadataSelectionForm, MetadataFormSet
-
-from .forms import DocumentTypeSelectForm
-
-
-class DocumentCreateWizard(BoundFormWizard):
-    def generate_metadata_initial_values(self):
-        initial = []
-        for metadata_type in self.metadata_types:
-            initial.append({
-                'metadata_type': metadata_type,
-            })
-
-        for metadata_set in self.metadata_sets:
-            for metadata_set_item in metadata_set.metadatasetitem_set.all():
-                data = {
-                    'metadata_type': metadata_set_item.metadata_type,
-                }
-                if data not in initial:
-                    initial.append(data)
-
-        return initial
-
-    def __init__(self, *args, **kwargs):
-        self.query_dict = {}
-        self.step_titles = kwargs.pop('step_titles', [
-            _(u'step 1 of 3: Document type'),
-            _(u'step 2 of 3: Metadata selection'),
-            _(u'step 3 of 3: Document metadata'),
-            ])
-
-        super(DocumentCreateWizard, self).__init__(*args, **kwargs)
-
-    def render_template(self, request, form, previous_fields, step, context=None):
-        context = {
-            'step_title': self.extra_context['step_titles'][step],
-            'submit_label': _(u'Next step'),
-            'submit_icon_famfam': 'arrow_right',
-        }
-        return super(DocumentCreateWizard, self).render_template(
-            request, form, previous_fields, step, context
-        )
-
-    def parse_params(self, request, *args, **kwargs):
-        self.extra_context = {'step_titles': self.step_titles}
-
-    def process_step(self, request, form, step):
-        if isinstance(form, DocumentTypeSelectForm):
-            self.document_type = form.cleaned_data['document_type']
-            self.initial = {1: {'document_type': self.document_type}}
-
-        if isinstance(form, MetadataSelectionForm):
-            self.metadata_sets = form.cleaned_data['metadata_sets']
-            self.metadata_types = form.cleaned_data['metadata_types']
-            initial_data = self.generate_metadata_initial_values()
-            self.initial = {2: initial_data}
-            if not initial_data:
-                # If there is no metadata selected, finish wizard
-                self.form_list = [DocumentTypeSelectForm, MetadataSelectionForm]
-
-        if isinstance(form, MetadataFormSet):
-            for identifier, metadata in enumerate(form.cleaned_data):
-                self.query_dict['metadata%s_id' % identifier] = metadata['id']
-                self.query_dict['metadata%s_value' % identifier] = metadata['value']
-
-    def get_template(self, step):
-        return 'generic_wizard.html'
-
-    def done(self, request, form_list):
-        if self.document_type:
-            self.query_dict['document_type_id'] = self.document_type.pk
-
-        url = '?'.join([reverse('upload_interactive'), urlencode(self.query_dict, doseq=True)])
-        return HttpResponseRedirect(url)