Merge branch 'hotfix/v0.12.3' into hotfix_0.12.3_merge
Conflicts: apps/acls/locale/de_DE/LC_MESSAGES/django.mo apps/acls/locale/en/LC_MESSAGES/django.po apps/acls/locale/es/LC_MESSAGES/django.mo apps/acls/locale/es/LC_MESSAGES/django.po apps/acls/locale/it/LC_MESSAGES/django.mo apps/acls/locale/pl/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.po apps/acls/locale/pt_BR/LC_MESSAGES/django.mo apps/acls/locale/pt_BR/LC_MESSAGES/django.po apps/acls/locale/ru/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.po apps/common/locale/en/LC_MESSAGES/django.po apps/common/locale/es/LC_MESSAGES/django.mo apps/common/locale/es/LC_MESSAGES/django.po apps/common/locale/it/LC_MESSAGES/django.mo apps/common/locale/it/LC_MESSAGES/django.po apps/common/locale/pl/LC_MESSAGES/django.mo apps/common/locale/pl/LC_MESSAGES/django.po apps/common/locale/pt/LC_MESSAGES/django.mo apps/common/locale/pt/LC_MESSAGES/django.po apps/common/locale/pt_BR/LC_MESSAGES/django.mo apps/common/locale/pt_BR/LC_MESSAGES/django.po apps/common/locale/ru/LC_MESSAGES/django.mo apps/common/locale/ru/LC_MESSAGES/django.po apps/converter/conf/settings.py apps/converter/locale/de_DE/LC_MESSAGES/django.mo apps/converter/locale/de_DE/LC_MESSAGES/django.po apps/converter/locale/en/LC_MESSAGES/django.po apps/converter/locale/es/LC_MESSAGES/django.mo apps/converter/locale/es/LC_MESSAGES/django.po apps/converter/locale/it/LC_MESSAGES/django.mo apps/converter/locale/it/LC_MESSAGES/django.po apps/converter/locale/pl/LC_MESSAGES/django.mo apps/converter/locale/pl/LC_MESSAGES/django.po apps/converter/locale/pt/LC_MESSAGES/django.mo apps/converter/locale/pt/LC_MESSAGES/django.po apps/converter/locale/pt_BR/LC_MESSAGES/django.mo apps/converter/locale/pt_BR/LC_MESSAGES/django.po apps/converter/locale/ru/LC_MESSAGES/django.mo apps/converter/locale/ru/LC_MESSAGES/django.po apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo apps/django_gpg/locale/en/LC_MESSAGES/django.po apps/django_gpg/locale/es/LC_MESSAGES/django.mo apps/django_gpg/locale/es/LC_MESSAGES/django.po apps/django_gpg/locale/it/LC_MESSAGES/django.mo apps/django_gpg/locale/pl/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.po apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po apps/django_gpg/locale/ru/LC_MESSAGES/django.mo apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo apps/document_comments/locale/en/LC_MESSAGES/django.po apps/document_comments/locale/es/LC_MESSAGES/django.mo apps/document_comments/locale/es/LC_MESSAGES/django.po apps/document_comments/locale/it/LC_MESSAGES/django.mo apps/document_comments/locale/pl/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.po apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po apps/document_comments/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/__init__.py apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po apps/document_indexing/locale/en/LC_MESSAGES/django.po apps/document_indexing/locale/es/LC_MESSAGES/django.mo apps/document_indexing/locale/es/LC_MESSAGES/django.po apps/document_indexing/locale/it/LC_MESSAGES/django.mo apps/document_indexing/locale/it/LC_MESSAGES/django.po apps/document_indexing/locale/pl/LC_MESSAGES/django.mo apps/document_indexing/locale/pl/LC_MESSAGES/django.po apps/document_indexing/locale/pt/LC_MESSAGES/django.mo apps/document_indexing/locale/pt/LC_MESSAGES/django.po apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po apps/document_indexing/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/locale/ru/LC_MESSAGES/django.po apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo apps/document_signatures/locale/en/LC_MESSAGES/django.po apps/document_signatures/locale/es/LC_MESSAGES/django.mo apps/document_signatures/locale/es/LC_MESSAGES/django.po apps/document_signatures/locale/it/LC_MESSAGES/django.mo apps/document_signatures/locale/pl/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.po apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po apps/document_signatures/locale/ru/LC_MESSAGES/django.mo apps/documents/__init__.py apps/documents/forms.py apps/documents/locale/de_DE/LC_MESSAGES/django.mo apps/documents/locale/de_DE/LC_MESSAGES/django.po apps/documents/locale/es/LC_MESSAGES/django.mo apps/documents/locale/es/LC_MESSAGES/django.po apps/documents/locale/it/LC_MESSAGES/django.mo apps/documents/locale/it/LC_MESSAGES/django.po apps/documents/locale/pl/LC_MESSAGES/django.mo apps/documents/locale/pl/LC_MESSAGES/django.po apps/documents/locale/pt/LC_MESSAGES/django.mo apps/documents/locale/pt/LC_MESSAGES/django.po apps/documents/locale/pt_BR/LC_MESSAGES/django.mo apps/documents/locale/pt_BR/LC_MESSAGES/django.po apps/documents/locale/ru/LC_MESSAGES/django.mo apps/documents/locale/ru/LC_MESSAGES/django.po apps/documents/views.py apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo apps/dynamic_search/locale/en/LC_MESSAGES/django.po apps/dynamic_search/locale/es/LC_MESSAGES/django.mo apps/dynamic_search/locale/es/LC_MESSAGES/django.po apps/dynamic_search/locale/it/LC_MESSAGES/django.mo apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.po apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo apps/dynamic_search/models.py apps/folders/locale/de_DE/LC_MESSAGES/django.mo apps/folders/locale/de_DE/LC_MESSAGES/django.po apps/folders/locale/en/LC_MESSAGES/django.po apps/folders/locale/es/LC_MESSAGES/django.mo apps/folders/locale/es/LC_MESSAGES/django.po apps/folders/locale/it/LC_MESSAGES/django.mo apps/folders/locale/pl/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.po apps/folders/locale/pt_BR/LC_MESSAGES/django.mo apps/folders/locale/pt_BR/LC_MESSAGES/django.po apps/folders/locale/ru/LC_MESSAGES/django.mo apps/history/locale/de_DE/LC_MESSAGES/django.mo apps/history/locale/en/LC_MESSAGES/django.po apps/history/locale/es/LC_MESSAGES/django.mo apps/history/locale/es/LC_MESSAGES/django.po apps/history/locale/it/LC_MESSAGES/django.mo apps/history/locale/pl/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.po apps/history/locale/pt_BR/LC_MESSAGES/django.mo apps/history/locale/pt_BR/LC_MESSAGES/django.po apps/history/locale/ru/LC_MESSAGES/django.mo apps/installation/locale/de_DE/LC_MESSAGES/django.mo apps/installation/locale/en/LC_MESSAGES/django.po apps/installation/locale/es/LC_MESSAGES/django.mo apps/installation/locale/es/LC_MESSAGES/django.po apps/installation/locale/it/LC_MESSAGES/django.mo apps/installation/locale/pl/LC_MESSAGES/django.mo apps/installation/locale/pt/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.po apps/installation/locale/ru/LC_MESSAGES/django.mo apps/linking/locale/de_DE/LC_MESSAGES/django.mo apps/linking/locale/en/LC_MESSAGES/django.po apps/linking/locale/es/LC_MESSAGES/django.mo apps/linking/locale/es/LC_MESSAGES/django.po apps/linking/locale/it/LC_MESSAGES/django.mo apps/linking/locale/pl/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.po apps/linking/locale/pt_BR/LC_MESSAGES/django.mo apps/linking/locale/pt_BR/LC_MESSAGES/django.po apps/linking/locale/ru/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.po apps/main/locale/en/LC_MESSAGES/django.po apps/main/locale/es/LC_MESSAGES/django.mo apps/main/locale/es/LC_MESSAGES/django.po apps/main/locale/it/LC_MESSAGES/django.mo apps/main/locale/it/LC_MESSAGES/django.po apps/main/locale/pl/LC_MESSAGES/django.mo apps/main/locale/pl/LC_MESSAGES/django.po apps/main/locale/pt/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.po apps/main/locale/ru/LC_MESSAGES/django.mo apps/main/locale/ru/LC_MESSAGES/django.po apps/metadata/__init__.py apps/metadata/locale/de_DE/LC_MESSAGES/django.mo apps/metadata/locale/en/LC_MESSAGES/django.po apps/metadata/locale/es/LC_MESSAGES/django.mo apps/metadata/locale/es/LC_MESSAGES/django.po apps/metadata/locale/it/LC_MESSAGES/django.mo apps/metadata/locale/pl/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.po apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo apps/metadata/locale/pt_BR/LC_MESSAGES/django.po apps/metadata/locale/ru/LC_MESSAGES/django.mo apps/navigation/locale/de_DE/LC_MESSAGES/django.mo apps/navigation/locale/en/LC_MESSAGES/django.po apps/navigation/locale/es/LC_MESSAGES/django.mo apps/navigation/locale/es/LC_MESSAGES/django.po apps/navigation/locale/it/LC_MESSAGES/django.mo apps/navigation/locale/pl/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.po apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo apps/navigation/locale/pt_BR/LC_MESSAGES/django.po apps/navigation/locale/ru/LC_MESSAGES/django.mo apps/navigation/templatetags/navigation_tags.py apps/ocr/locale/de_DE/LC_MESSAGES/django.mo apps/ocr/locale/en/LC_MESSAGES/django.po apps/ocr/locale/es/LC_MESSAGES/django.mo apps/ocr/locale/es/LC_MESSAGES/django.po apps/ocr/locale/it/LC_MESSAGES/django.mo apps/ocr/locale/pl/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.po apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo apps/ocr/locale/pt_BR/LC_MESSAGES/django.po apps/ocr/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.po apps/permissions/locale/en/LC_MESSAGES/django.po apps/permissions/locale/es/LC_MESSAGES/django.mo apps/permissions/locale/es/LC_MESSAGES/django.po apps/permissions/locale/it/LC_MESSAGES/django.mo apps/permissions/locale/it/LC_MESSAGES/django.po apps/permissions/locale/pl/LC_MESSAGES/django.mo apps/permissions/locale/pl/LC_MESSAGES/django.po apps/permissions/locale/pt/LC_MESSAGES/django.mo apps/permissions/locale/pt/LC_MESSAGES/django.po apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo apps/permissions/locale/pt_BR/LC_MESSAGES/django.po apps/permissions/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/ru/LC_MESSAGES/django.po apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo apps/project_setup/locale/en/LC_MESSAGES/django.po apps/project_setup/locale/es/LC_MESSAGES/django.mo apps/project_setup/locale/es/LC_MESSAGES/django.po apps/project_setup/locale/it/LC_MESSAGES/django.mo apps/project_setup/locale/pl/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.po apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po apps/project_setup/locale/ru/LC_MESSAGES/django.mo apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo apps/project_tools/locale/en/LC_MESSAGES/django.po apps/project_tools/locale/es/LC_MESSAGES/django.mo apps/project_tools/locale/es/LC_MESSAGES/django.po apps/project_tools/locale/it/LC_MESSAGES/django.mo apps/project_tools/locale/pl/LC_MESSAGES/django.mo apps/project_tools/locale/pt/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po apps/project_tools/locale/ru/LC_MESSAGES/django.mo apps/scheduler/locale/de_DE/LC_MESSAGES/django.mo apps/scheduler/locale/en/LC_MESSAGES/django.po apps/scheduler/locale/es/LC_MESSAGES/django.mo apps/scheduler/locale/es/LC_MESSAGES/django.po apps/scheduler/locale/it/LC_MESSAGES/django.mo apps/scheduler/locale/pl/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.po apps/scheduler/locale/pt_BR/LC_MESSAGES/django.mo apps/scheduler/locale/pt_BR/LC_MESSAGES/django.po apps/scheduler/locale/ru/LC_MESSAGES/django.mo apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo apps/smart_settings/locale/en/LC_MESSAGES/django.po apps/smart_settings/locale/es/LC_MESSAGES/django.mo apps/smart_settings/locale/es/LC_MESSAGES/django.po apps/smart_settings/locale/it/LC_MESSAGES/django.mo apps/smart_settings/locale/pl/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.po apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po apps/smart_settings/locale/ru/LC_MESSAGES/django.mo apps/sources/__init__.py apps/sources/locale/de_DE/LC_MESSAGES/django.mo apps/sources/locale/de_DE/LC_MESSAGES/django.po apps/sources/locale/es/LC_MESSAGES/django.mo apps/sources/locale/es/LC_MESSAGES/django.po apps/sources/locale/it/LC_MESSAGES/django.mo apps/sources/locale/it/LC_MESSAGES/django.po apps/sources/locale/pl/LC_MESSAGES/django.mo apps/sources/locale/pl/LC_MESSAGES/django.po apps/sources/locale/pt/LC_MESSAGES/django.mo apps/sources/locale/pt/LC_MESSAGES/django.po apps/sources/locale/pt_BR/LC_MESSAGES/django.mo apps/sources/locale/pt_BR/LC_MESSAGES/django.po apps/sources/locale/ru/LC_MESSAGES/django.mo apps/sources/locale/ru/LC_MESSAGES/django.po apps/sources/views.py apps/tags/locale/de_DE/LC_MESSAGES/django.mo apps/tags/locale/en/LC_MESSAGES/django.po apps/tags/locale/es/LC_MESSAGES/django.mo apps/tags/locale/es/LC_MESSAGES/django.po apps/tags/locale/it/LC_MESSAGES/django.mo apps/tags/locale/pl/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.po apps/tags/locale/pt_BR/LC_MESSAGES/django.mo apps/tags/locale/pt_BR/LC_MESSAGES/django.po apps/tags/locale/ru/LC_MESSAGES/django.mo apps/user_management/locale/de_DE/LC_MESSAGES/django.mo apps/user_management/locale/en/LC_MESSAGES/django.po apps/user_management/locale/es/LC_MESSAGES/django.mo apps/user_management/locale/es/LC_MESSAGES/django.po apps/user_management/locale/it/LC_MESSAGES/django.mo apps/user_management/locale/pl/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.po apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo apps/user_management/locale/pt_BR/LC_MESSAGES/django.po apps/user_management/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.po apps/web_theme/locale/en/LC_MESSAGES/django.po apps/web_theme/locale/es/LC_MESSAGES/django.mo apps/web_theme/locale/es/LC_MESSAGES/django.po apps/web_theme/locale/it/LC_MESSAGES/django.mo apps/web_theme/locale/it/LC_MESSAGES/django.po apps/web_theme/locale/pl/LC_MESSAGES/django.mo apps/web_theme/locale/pl/LC_MESSAGES/django.po apps/web_theme/locale/pt/LC_MESSAGES/django.mo apps/web_theme/locale/pt/LC_MESSAGES/django.po apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po apps/web_theme/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/ru/LC_MESSAGES/django.po misc/compilemessages_all.sh misc/makemessages_all.sh requirements/production.txt settings.py
This commit is contained in:
Roberto Rosario
@@ -18,6 +18,8 @@ from documents.permissions import (PERMISSION_DOCUMENT_CREATE,
|
||||
from documents.models import DocumentType, Document
|
||||
from documents.conf.settings import THUMBNAIL_SIZE
|
||||
from documents.exceptions import NewDocumentVersionNotAllowed
|
||||
from documents.forms import DocumentTypeSelectForm
|
||||
from metadata.forms import MetadataFormSet, MetadataSelectionForm
|
||||
from metadata.api import decode_metadata_from_url, metadata_repr_as_list
|
||||
from permissions.models import Permission
|
||||
from common.utils import encapsulate
|
||||
@@ -41,6 +43,7 @@ from .forms import SourceTransformationForm, SourceTransformationForm_create
|
||||
from .permissions import (PERMISSION_SOURCES_SETUP_VIEW,
|
||||
PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE,
|
||||
PERMISSION_SOURCES_SETUP_CREATE)
|
||||
from .wizards import DocumentCreateWizard
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -789,3 +792,11 @@ def setup_source_transformation_create(request, source_type, source_id):
|
||||
'navigation_object_name': 'source',
|
||||
'title': _(u'Create new transformation for source: %s') % source,
|
||||
}, 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)
|
||||
|
||||
Reference in New Issue
Block a user