matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The documents app should not have any knowledge of the sources app, move sources link registration to the sources app

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-14 17:49:59 -04:00
parent 4f94bf0dfc
commit 6e333b7eeb
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/documents/__init__.py
View File

@@ -77,10 +77,8 @@ register_links(Document, [document_events_view, document_version_list], menu_nam
# 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')
register_links(['documents:document_list_recent', 'documents:document_list'], [document_list_recent, document_list], menu_name='secondary_menu')
register_links(Document, [document_list_recent, document_list], menu_name='secondary_menu')
# Document page links
register_links(DocumentPage, [

23
mayan/apps/sources/__init__.py
View File

@@ -3,6 +3,7 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from common.utils import encapsulate
from documents.links import document_list_recent, document_list
from documents.models import Document
from navigation.api import register_links, register_model_list_columns
from project_setup.api import register_setup
@@ -24,17 +25,6 @@ from .links import (document_create_multiple, document_create_siblings,
from .models import Source, SourceTransformation
from .widgets import staging_file_thumbnail
register_links([StagingFile], [staging_file_delete])
register_links([Source, 'sources:setup_source_list', 'sources:setup_source_create'], [setup_sources, setup_source_create_webform, setup_source_create_staging_folder, setup_source_create_pop3_email, setup_source_create_imap_email, setup_source_create_watch_folder], menu_name='secondary_menu')
register_links([Source], [setup_source_edit, setup_source_transformation_list, setup_source_delete])
register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete])
register_links(['sources:setup_source_transformation_create', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
# Document version
register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar')
register_model_list_columns(StagingFile, [
{
'name': _(u'Thumbnail'), 'attribute':
@@ -42,9 +32,16 @@ register_model_list_columns(StagingFile, [
},
])
register_setup(setup_sources)
register_links([StagingFile], [staging_file_delete])
register_links([Source, 'sources:setup_source_list', 'sources:setup_source_create'], [setup_sources, setup_source_create_webform, setup_source_create_staging_folder, setup_source_create_pop3_email, setup_source_create_imap_email, setup_source_create_watch_folder], menu_name='secondary_menu')
register_links([Source], [setup_source_edit, setup_source_transformation_list, setup_source_delete])
register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete])
register_links(['sources:setup_source_transformation_create', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar')
register_links([Document, 'documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], [document_create_multiple], menu_name='secondary_menu')
register_links(Document, [document_create_siblings])
register_links(['sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], [document_list_recent, document_list], menu_name='secondary_menu')
register_setup(setup_sources)
APIEndPoint('sources')