diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index 5055d00152..973cbbee27 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -33,7 +33,7 @@ document_list = {'text': _(u'documents list'), 'view': 'document_list', 'famfam' document_list_recent = {'text': _(u'recent documents list'), 'view': 'document_list_recent', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}} document_create = {'text': _(u'upload a new document'), 'view': 'document_create', 'famfam': 'page_add', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} document_create_multiple = {'text': _(u'upload new documents'), 'view': 'document_create_multiple', 'famfam': 'page_add', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} -document_create_sibling = {'text': _(u'upload new documents using same metadata'), 'view': 'document_create_sibling', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} +document_create_siblings = {'text': _(u'upload new documents using same metadata'), 'view': 'document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} document_view_simple = {'text': _(u'details (simple)'), 'view': 'document_view_simple', 'args': 'object.id', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}} document_view_advanced = {'text': _(u'details (advanced)'), 'view': 'document_view_advanced', 'args': 'object.id', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}} document_delete = {'text': _(u'delete'), 'view': 'document_delete', 'args': 'object.id', 'famfam': 'page_delete', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_DELETE]}} @@ -77,7 +77,7 @@ staging_file_preview = {'text': _(u'preview'), 'class': 'fancybox-noscaling', 'v staging_file_delete = {'text': _(u'delete'), 'view': 'staging_file_delete', 'args': ['source', 'object.id'], 'famfam': 'drive_delete'} register_links(Document, [document_view_simple, document_view_advanced, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations]) -register_links(Document, [document_create_sibling], menu_name='sidebar') +register_links(Document, [document_create_siblings], menu_name='sidebar') register_multi_item_links(['document_group_view', 'document_list', 'document_list_recent'], [document_multiple_clear_transformations, document_multiple_delete]) diff --git a/apps/documents/urls.py b/apps/documents/urls.py index e9b0a795b0..037ff76b05 100644 --- a/apps/documents/urls.py +++ b/apps/documents/urls.py @@ -34,7 +34,7 @@ urlpatterns = patterns('documents.views', url(r'^(?P\d+)/display/print/$', 'get_document_image', {'size': PRINT_SIZE, 'quality': QUALITY_PRINT}, 'document_display_print'), url(r'^(?P\d+)/download/$', 'document_download', (), 'document_download'), - url(r'^(?P\d+)/create/siblings/$', 'document_create_sibling', 'document_create_sibling'), + url(r'^(?P\d+)/create/siblings/$', 'document_create_siblings', (), 'document_create_siblings'), url(r'^(?P\d+)/find_duplicates/$', 'document_find_duplicates', (), 'document_find_duplicates'), url(r'^(?P\d+)/clear_transformations/$', 'document_clear_transformations', (), 'document_clear_transformations'), diff --git a/apps/documents/views.py b/apps/documents/views.py index e87049875a..6369a49712 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -93,7 +93,7 @@ def document_create(request): return wizard(request) -def document_create_sibling(request, document_id): +def document_create_siblings(request, document_id): check_permissions(request.user, 'documents', [PERMISSION_DOCUMENT_CREATE]) document = get_object_or_404(Document, pk=document_id) diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index 0fcd10bc36..aaee19851d 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -6,6 +6,6 @@ from documents.literals import PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_V document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'page_go', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}} document_group_back_to_document = {'text': _(u'return to document'), 'view': 'document_view_simple', 'args': 'ref_object.id', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}} -document_group_create_sibling = {'text': _(u'upload new document using same metadata'), 'view': 'document_create_sibling', 'args': 'ref_object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} +document_group_create_siblings = {'text': _(u'upload new documents using same metadata'), 'view': 'document_create_siblings', 'args': 'ref_object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}} -register_links(['document_group_view'], [document_group_back_to_document, document_group_create_sibling], menu_name='sidebar') +register_links(['document_group_view'], [document_group_back_to_document, document_group_create_siblings], menu_name='sidebar')