From 7771740e5925c3575260067843ea40c9cf2c1f1b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 2 Jul 2015 20:28:43 -0400 Subject: [PATCH] Remove unused views --- mayan/apps/document_indexing/views.py | 48 --------------------------- mayan/apps/documents/views.py | 26 --------------- 2 files changed, 74 deletions(-) diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index 6581d524a0..b1bb9d4397 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -362,54 +362,6 @@ class IndexInstanceNodeView(DocumentListView): return context -def index_instance_node_view(request, index_instance_node_pk): - """ - Show an instance node and it's content, whether is other child nodes - of documents - """ - index_instance = get_object_or_404(IndexInstanceNode, pk=index_instance_node_pk) - index_instance_list = index_instance.get_children().order_by('value') - breadcrumbs = get_breadcrumbs(index_instance) - - try: - Permission.check_permissions(request.user, [permission_document_indexing_view]) - except PermissionDenied: - AccessControlList.objects.check_access(permission_document_indexing_view, request.user, index_instance.index) - - title = mark_safe(_('Contents for index: %s') % breadcrumbs) - - if index_instance: - if index_instance.index_template_node.link_documents: - # Document list, use the document_list view for consistency - return document_list( - request, - title=title, - object_list=index_instance.documents.all(), - extra_context={ - 'object': index_instance - } - ) - - return render_to_response('appearance/generic_list.html', { - 'object_list': index_instance_list, - 'extra_columns': [ - { - 'name': _('Node'), - 'attribute': encapsulate(lambda x: index_instance_item_link(x)) - }, - { - 'name': _('Items'), - 'attribute': encapsulate(lambda x: x.documents.count() if x.index_template_node.link_documents else x.get_children().count()) - } - ], - 'title': title, - 'hide_links': True, - 'hide_object': True, - 'object': index_instance - - }, context_instance=RequestContext(request)) - - def rebuild_index_instances(request): """ Confirmation view to execute the tool: do_rebuild_all_indexes diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 3bb0fcb055..c1efeae8b6 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -106,32 +106,6 @@ class RecentDocumentListView(DocumentListView): return RecentDocument.objects.get_for_user(self.request.user) -def document_list(request, object_list=None, title=None, extra_context=None): - pre_object_list = object_list if not (object_list is None) else Document.objects.all() - - try: - Permission.check_permissions(request.user, [permission_document_view]) - except PermissionDenied: - # If user doesn't have global permission, get a list of document - # for which he/she does hace access use it to filter the - # provided object_list - final_object_list = AccessControlList.objects.filter_by_access( - permission_document_view, request.user, pre_object_list) - else: - final_object_list = pre_object_list - - context = { - 'object_list': final_object_list, - 'title': title if title else _('documents'), - 'hide_links': True, - } - if extra_context: - context.update(extra_context) - - return render_to_response('appearance/generic_list.html', context, - context_instance=RequestContext(request)) - - def document_properties(request, document_id): document = get_object_or_404(Document, pk=document_id)