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

Convert index list view to CBV.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-02 01:49:52 -04:00
parent 51d50672f3
commit c3c4fcb2b2
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/document_indexing/urls.py
View File

@@ -7,7 +7,7 @@ from .api_views import (
APIIndexNodeInstanceDocumentListView, APIIndexTemplateListView,
APIIndexTemplateView, APIIndexView
)
from .views import SetupIndexDocumentTypesView, SetupIndexListView
from .views import IndexListView, SetupIndexDocumentTypesView, SetupIndexListView
urlpatterns = patterns(
@@ -23,7 +23,7 @@ urlpatterns = patterns(
url(r'^setup/template/node/(?P<node_pk>\d+)/edit/$', 'template_node_edit', name='template_node_edit'),
url(r'^setup/template/node/(?P<node_pk>\d+)/delete/$', 'template_node_delete', name='template_node_delete'),
url(r'^index/list/$', 'index_list', name='index_list'),
url(r'^index/list/$', IndexListView.as_view(), name='index_list'),
url(r'^instance/node/(?P<index_instance_node_pk>\d+)/$', 'index_instance_node_view', name='index_instance_node_view'),
url(r'^rebuild/all/$', 'rebuild_index_instances', name='rebuild_index_instances'),

36
mayan/apps/document_indexing/views.py
View File

@@ -275,32 +275,30 @@ def template_node_delete(request, node_pk):
context_instance=RequestContext(request))
# User views
def index_list(request):
"""
Show a list of enabled indexes
"""
context = {
class IndexListView(SingleObjectListView):
@staticmethod
def get_items_count(instance):
try:
if instance.template_root.link_documents:
return instance.instance_root.documents.count()
else:
return instance.instance_root.get_children().count()
except IndexInstanceNode.DoesNotExist:
return 0
queryset = Index.objects.filter(enabled=True)
object_permission = permission_document_indexing_view
def get_extra_context(self):
return {
'title': _('Indexes'),
'hide_links': True,
'extra_columns': [
{'name': _('Items'), 'attribute': encapsulate(lambda x: x.instance_root.documents.count() if x.template_root.link_documents else x.instance_root.get_children().count())},
{'name': _('Items'), 'attribute': encapsulate(lambda instance: IndexListView.get_items_count(instance))},
{'name': _('Document types'), 'attribute': 'get_document_types_names'},
],
}
queryset = Index.objects.filter(enabled=True)
try:
Permission.check_permissions(request.user, [permission_document_indexing_view])
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(permission_document_indexing_view, request.user, queryset)
context['object_list'] = queryset
return render_to_response('appearance/generic_list.html', context,
context_instance=RequestContext(request))
def index_instance_node_view(request, index_instance_node_pk):
"""