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

Change index setup list view to CBV.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-02 01:32:03 -04:00
parent d47091df61
commit 51d50672f3
2 changed files with 16 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,12 +7,12 @@ from .api_views import (
APIIndexNodeInstanceDocumentListView, APIIndexTemplateListView,
APIIndexTemplateView, APIIndexView
)
from .views import SetupIndexDocumentTypesView
from .views import SetupIndexDocumentTypesView, SetupIndexListView
urlpatterns = patterns(
'document_indexing.views',
url(r'^setup/index/list/$', 'index_setup_list', name='index_setup_list'),
url(r'^setup/index/list/$', SetupIndexListView.as_view(), name='index_setup_list'),
url(r'^setup/index/create/$', 'index_setup_create', name='index_setup_create'),
url(r'^setup/index/(?P<index_pk>\d+)/edit/$', 'index_setup_edit', name='index_setup_edit'),
url(r'^setup/index/(?P<index_pk>\d+)/delete/$', 'index_setup_delete', name='index_setup_delete'),

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

@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from acls.models import AccessControlList
from common.utils import encapsulate
from common.views import AssignRemoveView
from common.views import AssignRemoveView, SingleObjectListView
from common.widgets import two_state_template
from documents.models import Document, DocumentType
from documents.permissions import permission_document_view
@@ -33,28 +33,20 @@ from .widgets import index_instance_item_link, get_breadcrumbs, node_level
# Setup views
def index_setup_list(request):
context = {
'title': _('Indexes'),
'hide_object': True,
'extra_columns': [
{'name': _('Name'), 'attribute': 'name'},
{'name': _('Title'), 'attribute': 'title'},
{'name': _('Enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
]
}
class SetupIndexListView(SingleObjectListView):
model = Index
view_permission = permission_document_indexing_setup
queryset = Index.objects.all()
try:
Permission.check_permissions(request.user, [permission_document_indexing_setup])
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(permission_document_indexing_setup, request.user, queryset)
context['object_list'] = queryset
return render_to_response('appearance/generic_list.html', context,
context_instance=RequestContext(request))
def get_extra_context(self):
return {
'title': _('Indexes'),
'hide_object': True,
'extra_columns': [
{'name': _('Name'), 'attribute': 'name'},
{'name': _('Title'), 'attribute': 'title'},
{'name': _('Enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
]
}
def index_setup_create(request):