diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index b334937aed..c05c63801c 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -22,8 +22,9 @@ from .events import (HISTORY_DOCUMENT_CREATED, HISTORY_DOCUMENT_DELETED, HISTORY_DOCUMENT_EDITED) from .links import (document_clear_image_cache, document_clear_transformations, document_delete, - document_document_type, document_download, document_edit, - document_history_view, document_list, + document_document_type_edit, + document_multiple_document_type_edit, document_download, + document_edit, document_history_view, document_list, document_list_recent, document_missing_list, document_multiple_delete, document_multiple_clear_transformations, @@ -74,12 +75,13 @@ register_links(DocumentTypeFilename, [document_type_filename_edit, document_type register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') # Register document links -register_links(Document, [document_view_simple, document_edit, document_document_type, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count]) -register_links([Document], [link_spacer, document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count], menu_name='multi_item_links') +register_links(Document, [document_view_simple, document_edit, document_document_type_edit, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count]) +register_links([Document], [link_spacer, document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count, document_multiple_document_type_edit], menu_name='multi_item_links') # Document Version links register_links(DocumentVersion, [document_version_revert, document_version_download]) secondary_menu_links = [document_list_recent, document_list] +# TODO: register this at sources app too register_links(['documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], secondary_menu_links, menu_name='secondary_menu') register_links(Document, secondary_menu_links, menu_name='secondary_menu') diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index 8a71a943c1..6d599aa576 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -43,7 +43,8 @@ document_view_advanced = {'text': _(u'Properties'), 'view': 'documents:document_ document_delete = {'text': _(u'Delete'), 'view': 'documents:document_delete', 'args': 'object.id', 'famfam': 'page_delete', 'permissions': [PERMISSION_DOCUMENT_DELETE]} document_multiple_delete = {'text': _(u'Delete'), 'view': 'documents:document_multiple_delete', 'famfam': 'page_delete', 'permissions': [PERMISSION_DOCUMENT_DELETE]} document_edit = {'text': _(u'Edit properties'), 'view': 'documents:document_edit', 'args': 'object.id', 'famfam': 'page_edit', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]} -document_document_type = {'text': _(u'Change type'), 'view': 'documents:document_document_type', 'args': 'object.id', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]} +document_document_type_edit = {'text': _(u'Change type'), 'view': 'documents:document_document_type_edit', 'args': 'object.id', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]} +document_multiple_document_type_edit = {'text': _(u'Change type'), 'view': 'documents:document_multiple_document_type_edit', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]} document_download = {'text': _(u'Download'), 'view': 'documents:document_download', 'args': 'object.id', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} document_multiple_download = {'text': _(u'Download'), 'view': 'documents:document_multiple_download', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} document_version_download = {'text': _(u'Download'), 'view': 'documents:document_version_download', 'args': 'object.pk', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 197b68b382..4472af4558 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -41,7 +41,7 @@ from .settings import (CACHE_PATH, DISPLAY_SIZE, LANGUAGE, ZOOM_MAX_LEVEL, from .signals import post_version_upload, post_document_type_change HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest() # document image cache name hash function -UUID_FUNCTION = lambda x: unicode(uuid.uuid4()) +UUID_FUNCTION = lambda: unicode(uuid.uuid4()) logger = logging.getLogger(__name__) diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 70c849dd1b..2aa6004c72 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -16,7 +16,8 @@ urlpatterns = patterns('documents.views', url(r'^(?P\d+)/view/$', 'document_view', (), 'document_view_simple'), url(r'^(?P\d+)/view/advanced/$', 'document_view', {'advanced': True}, 'document_view_advanced'), - url(r'^(?P\d+)/type/$', 'document_document_type', name='document_document_type'), + url(r'^(?P\d+)/type/$', 'document_document_type_edit', name='document_document_type_edit'), + url(r'^multiple/type/$', 'document_multiple_document_type_edit', name='document_multiple_document_type_edit'), url(r'^(?P\d+)/delete/$', 'document_delete', (), 'document_delete'), url(r'^multiple/delete/$', 'document_multiple_delete', (), 'document_multiple_delete'), url(r'^(?P\d+)/edit/$', 'document_edit', (), 'document_edit'), diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 576ebbe70a..7449ea4f9a 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -253,33 +253,59 @@ def document_edit(request, document_id): }, context_instance=RequestContext(request)) -def document_document_type(request, document_id): - document = get_object_or_404(Document, pk=document_id) +def document_document_type_edit(request, document_id=None, document_id_list=None): + post_action_redirect = None + + if document_id: + documents = [get_object_or_404(Document, pk=document_id)] + post_action_redirect = reverse('documents:document_list_recent') + elif document_id_list: + documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] + else: + messages.error(request, _(u'Must provide at least one document.')) + return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))) try: Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_PROPERTIES_EDIT]) except PermissionDenied: - AccessEntry.objects.check_access(PERMISSION_DOCUMENT_PROPERTIES_EDIT, request.user, document) + documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_DOCUMENT_PROPERTIES_EDIT, request.user, documents, exception_on_empty=True) + + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) + next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) if request.method == 'POST': form = DocumentTypeSelectForm(request.POST) if form.is_valid(): - document.set_document_type(form.cleaned_data['document_type']) - create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user}) - document.add_as_recent_document_for_user(request.user) - messages.success(request, _(u'Document type for document "%s" changed successfully.') % document) + for document in documents: + document.set_document_type(form.cleaned_data['document_type']) + create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user}) + document.add_as_recent_document_for_user(request.user) - return HttpResponseRedirect(document.get_absolute_url()) + messages.success(request, _(u'Document type changed successfully.')) + return HttpResponseRedirect(next) else: - form = DocumentTypeSelectForm(initial={'document_type': document.document_type}) + form = DocumentTypeSelectForm(initial={'document_type': documents[0].document_type}) - return render_to_response('main/generic_form.html', { + context = { 'form': form, - 'object': document, - 'title': _('Change document type of: %s') % document, 'submit_label': _('Submit'), - }, context_instance=RequestContext(request)) + } + + if len(documents) == 1: + context['object'] = documents[0] + context['title'] = _(u'Are you sure you wish to change the type of the document: %s?') % ', '.join([unicode(d) for d in documents]) + elif len(documents) > 1: + context['title'] = _(u'Are you sure you wish to change the type of the documents: %s?') % ', '.join([unicode(d) for d in documents]) + + return render_to_response('main/generic_form.html', context, + context_instance=RequestContext(request)) + + +def document_multiple_document_type_edit(request): + return document_document_type_edit( + request, document_id_list=request.GET.get('id_list', []) + ) # TODO: Get rid of this view and convert widget to use API and base64 only images