From 74ec57b9318deadf1da1d291e43be439b46edf90 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 29 Jul 2012 00:09:18 -0400 Subject: [PATCH] Move multi item link registration back to their separate apps until a better solution is found --- apps/documents/__init__.py | 9 ++++++--- apps/main/__init__.py | 4 ---- apps/main/utils.py | 22 ---------------------- apps/metadata/__init__.py | 7 +++++-- apps/ocr/__init__.py | 6 ++++-- 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 apps/main/utils.py diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index e0dd05875c..85e3e6ef06 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from common.utils import validate_path, encapsulate from navigation.api import (bind_links, register_top_menu, register_model_list_columns, - register_sidebar_template, Link) + register_sidebar_template, Link, register_multi_item_links) from diagnostics.api import register_diagnostic from maintenance.api import register_maintenance_links from history.permissions import PERMISSION_HISTORY_VIEW @@ -40,10 +40,11 @@ from .links import (document_page_transformation_list, document_page_transformat document_page_view, document_page_text, document_page_edit, document_page_navigation_next, document_page_navigation_previous, document_page_navigation_first, document_page_navigation_last, document_page_zoom_in, document_page_zoom_out, - document_page_rotate_right, document_page_rotate_left, document_page_view_reset) + document_page_rotate_right, document_page_rotate_left, document_page_view_reset, + document_multiple_clear_transformations, document_multiple_delete, + document_multiple_download) from .links import document_clear_image_cache - # Register document type links bind_links([DocumentType], [document_type_document_list, document_type_filename_list, document_type_edit, document_type_delete]) bind_links([DocumentTypeFilename], [document_type_filename_edit, document_type_filename_delete]) @@ -85,6 +86,8 @@ register_diagnostic('documents', _(u'Documents'), document_missing_list) register_maintenance_links([document_find_all_duplicates, document_update_page_count, document_clear_image_cache], namespace='documents', title=_(u'documents')) +register_multi_item_links(['folder_view', 'search', 'results', 'index_instance_node_view', 'document_find_duplicates', 'document_type_document_list', 'document_group_view', 'document_list', 'document_list_recent'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) + register_model_list_columns(Document, [ {'name':_(u'thumbnail'), 'attribute': encapsulate(lambda x: document_thumbnail(x, gallery_name='document_list', title=x.filename)) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index a841ce361f..2181b6e722 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -5,7 +5,6 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link, register_top_menu from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW -from .utils import register_multi_items_links __author__ = 'Roberto Rosario' __copyright__ = 'Copyright 2011 Roberto Rosario' @@ -42,6 +41,3 @@ def get_version(): return ''.join(vers) __version__ = get_version() - - -register_multi_items_links() diff --git a/apps/main/utils.py b/apps/main/utils.py deleted file mode 100644 index dbb9c3e931..0000000000 --- a/apps/main/utils.py +++ /dev/null @@ -1,22 +0,0 @@ -from navigation.api import register_multi_item_links - -from documents.links import document_multiple_clear_transformations, document_multiple_delete, document_multiple_download -from metadata.links import metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove -from ocr.links import submit_document_multiple - - -def register_multi_items_links(): - view = [ - # folders - 'folder_view', - - # search - 'search', 'results', - - # document_indexing - 'index_instance_node_view', - - # documents - 'document_find_duplicates', 'document_type_document_list', 'document_group_view', 'document_list', 'document_list_recent', - ] - register_multi_item_links(view, [submit_document_multiple, metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove, document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) diff --git a/apps/metadata/__init__.py b/apps/metadata/__init__.py index 7c57741578..e85c078bfe 100644 --- a/apps/metadata/__init__.py +++ b/apps/metadata/__init__.py @@ -3,7 +3,7 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ from navigation.api import (bind_links, register_sidebar_template, - register_model_list_columns) + register_model_list_columns, register_multi_item_links) from common.utils import encapsulate from documents.models import Document, DocumentType from project_setup.api import register_setup @@ -18,7 +18,8 @@ from .links import (metadata_edit, metadata_view, metadata_add, metadata_remove, setup_metadata_type_list, setup_metadata_type_edit, setup_metadata_type_delete, setup_metadata_type_create, setup_metadata_set_list, setup_metadata_set_edit, setup_metadata_set_delete, setup_metadata_set_create, setup_metadata_set_members, - setup_document_type_metadata) + setup_document_type_metadata, metadata_multiple_add, metadata_multiple_edit, + metadata_multiple_remove) bind_links(['metadata_add', 'metadata_edit', 'metadata_remove', 'metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') bind_links([Document], [metadata_view], menu_name='form_header') @@ -31,6 +32,8 @@ bind_links([MetadataSet, 'setup_metadata_set_list', 'setup_metadata_set_create'] bind_links([DocumentType], [setup_document_type_metadata]) +register_multi_item_links(['folder_view', 'search', 'results', 'index_instance_node_view', 'document_find_duplicates', 'document_type_document_list', 'document_group_view', 'document_list', 'document_list_recent'], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove]) + metadata_type_setup_views = ['setup_metadata_type_list', 'setup_metadata_type_edit', 'setup_metadata_type_delete', 'setup_metadata_type_create'] metadata_set_setup_views = ['setup_metadata_set_list', 'setup_metadata_set_edit', 'setup_metadata_set_members', 'setup_metadata_set_delete', 'setup_metadata_set_create'] diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index 0249facff1..0775677295 100644 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -9,7 +9,8 @@ from django.db.models.signals import post_save, post_syncdb from django.dispatch import receiver from django.db.utils import DatabaseError -from navigation.api import bind_links, register_multi_item_links +from navigation.api import (bind_links, register_multi_item_links, + register_multi_item_links) from documents.models import Document, DocumentVersion from maintenance.api import register_maintenance_links from project_tools.api import register_tool @@ -31,7 +32,7 @@ from .links import (submit_document, re_queue_multiple_document, document_queue_enable, all_document_ocr_cleanup, queue_document_list, ocr_tool_link, setup_queue_transformation_list, setup_queue_transformation_create, setup_queue_transformation_edit, - setup_queue_transformation_delete) + setup_queue_transformation_delete, submit_document_multiple) bind_links([Document], [submit_document]) bind_links([DocumentQueue], [document_queue_disable, document_queue_enable, setup_queue_transformation_list]) @@ -43,6 +44,7 @@ bind_links(['setup_queue_transformation_create', 'setup_queue_transformation_edi bind_links(['setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'setup_queue_transformation_list', 'setup_queue_transformation_create'], [setup_queue_transformation_create], menu_name='sidebar') register_maintenance_links([all_document_ocr_cleanup], namespace='ocr', title=_(u'OCR')) +register_multi_item_links(['folder_view', 'search', 'results', 'index_instance_node_view', 'document_find_duplicates', 'document_type_document_list', 'document_group_view', 'document_list', 'document_list_recent'], [submit_document_multiple]) @transaction.commit_on_success