From 874eb33f0ad4f04dbbf9aa51ba5994e2bc846c6a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 3 Jul 2014 16:41:34 -0400 Subject: [PATCH] Remove the document type document list view, issue #8 --- mayan/apps/documents/__init__.py | 13 +++++++------ mayan/apps/documents/links.py | 1 - mayan/apps/documents/urls.py | 1 - mayan/apps/documents/views.py | 16 ---------------- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index ef2d37a940..0a879a76d2 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -32,9 +32,10 @@ from .links import (document_list, document_list_recent, 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_version_list, document_version_revert, document_type_list, - document_type_setup, document_type_document_list, document_type_edit, document_type_delete, - document_type_create, document_type_filename_list, document_type_filename_create, - document_type_filename_edit, document_type_filename_delete) + document_type_setup, document_type_edit, document_type_delete, + document_type_create, document_type_filename_list, + document_type_filename_create, document_type_filename_edit, + document_type_filename_delete) from .models import (Document, DocumentPage, DocumentPageTransformation, DocumentType, DocumentTypeFilename, DocumentVersion) @@ -51,15 +52,15 @@ register_history_type(HISTORY_DOCUMENT_EDITED) register_history_type(HISTORY_DOCUMENT_DELETED) # Register document type links -register_links(DocumentType, [document_type_edit, document_type_delete, document_type_document_list, document_type_filename_list]) +register_links(DocumentType, [document_type_edit, document_type_delete, document_type_filename_list]) register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete]) -register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu') +register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu') register_links([DocumentTypeFilename, 'document_type_filename_list', 'document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') # Register document links register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations]) -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) +register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) # Document Version links register_links(DocumentVersion, [document_version_revert, document_version_download]) diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index d13b54e702..060a558cd0 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -85,7 +85,6 @@ document_version_revert = {'text': _(u'revert'), 'view': 'document_version_rever # Document type related links document_type_list = {'text': _(u'document type list'), 'view': 'document_type_list', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]} document_type_setup = {'text': _(u'document types'), 'view': 'document_type_list', 'famfam': 'layout', 'icon': 'layout.png', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW], 'children_view_regex': [r'^document_type_']} -document_type_document_list = {'text': _(u'documents of this type'), 'view': 'document_type_document_list', 'args': 'document_type.id', 'famfam': 'page_go', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]} document_type_edit = {'text': _(u'edit'), 'view': 'document_type_edit', 'args': 'document_type.id', 'famfam': 'layout_edit', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]} document_type_delete = {'text': _(u'delete'), 'view': 'document_type_delete', 'args': 'document_type.id', 'famfam': 'layout_delete', 'permissions': [PERMISSION_DOCUMENT_TYPE_DELETE]} document_type_create = {'text': _(u'create document type'), 'view': 'document_type_create', 'famfam': 'layout_add', 'permissions': [PERMISSION_DOCUMENT_TYPE_CREATE]} diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 185f1016c0..c48976263e 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -65,7 +65,6 @@ urlpatterns = patterns('documents.views', # Admin views url(r'^type/list/$', 'document_type_list', (), 'document_type_list'), url(r'^type/create/$', 'document_type_create', (), 'document_type_create'), - url(r'^type/(?P\d+)/list/documents/$', 'document_type_document_list', (), 'document_type_document_list'), url(r'^type/(?P\d+)/edit/$', 'document_type_edit', (), 'document_type_edit'), url(r'^type/(?P\d+)/delete/$', 'document_type_delete', (), 'document_type_delete'), diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index b5169c8b11..e6c519ce81 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -885,22 +885,6 @@ def document_type_list(request): context_instance=RequestContext(request)) -def document_type_document_list(request, document_type_id): - Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TYPE_VIEW]) - document_type = get_object_or_404(DocumentType, pk=document_type_id) - - return document_list( - request, - object_list=Document.objects.filter(document_type=document_type), - title=_(u'documents of type "%s"') % document_type, - extra_context={ - 'object_name': _(u'document type'), - 'navigation_object_name': 'document_type', - 'document_type': document_type, - } - ) - - def document_type_edit(request, document_type_id): Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TYPE_EDIT]) document_type = get_object_or_404(DocumentType, pk=document_type_id)