From f7f2135cadd0bffb98f845612ee8525745c198f1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 14 Aug 2015 14:54:32 -0400 Subject: [PATCH] Convert OCR error entry list view to CBV. --- mayan/apps/ocr/urls.py | 4 ++-- mayan/apps/ocr/views.py | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index ee9b74e25f..55a0fd3711 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -5,7 +5,7 @@ from django.conf.urls import patterns, url from .api_views import DocumentVersionOCRView from .views import ( DocumentSubmitView, DocumentAllSubmitView, DocumentManySubmitView, - DocumentTypeSettingsEditView + DocumentTypeSettingsEditView, EntryListView ) urlpatterns = patterns( @@ -32,7 +32,7 @@ urlpatterns = patterns( name='document_type_ocr_settings' ), - url(r'^all/$', 'entry_list', name='entry_list'), + url(r'^all/$', EntryListView.as_view(), name='entry_list'), url(r'^(?P\d+)/delete/$', 'entry_delete', name='entry_delete'), url( r'^multiple/delete/$', 'entry_delete_multiple', diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index c89a4c0af8..ddc3ca9d37 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -10,7 +10,9 @@ from django.template import RequestContext from django.utils.translation import ugettext_lazy as _, ungettext from acls.models import AccessControlList -from common.views import ConfirmView, SingleObjectEditView +from common.generics import ( + ConfirmView, SingleObjectEditView, SingleObjectListView +) from documents.models import Document, DocumentType, DocumentVersion from permissions import Permission @@ -137,19 +139,15 @@ def document_content(request, document_id): }, context_instance=RequestContext(request)) -def entry_list(request): - Permission.check_permissions(request.user, (permission_ocr_document,)) - - context = { - 'object_list': DocumentVersionOCRError.objects.all(), - 'title': _('OCR errors'), +class EntryListView(SingleObjectListView): + extra_context = { 'hide_object': True, + 'title': _('OCR errors'), } + view_permission = permission_ocr_document - return render_to_response( - 'appearance/generic_list.html', context, - context_instance=RequestContext(request) - ) + def get_queryset(self): + return DocumentVersionOCRError.objects.all() def entry_delete(request, pk=None, pk_list=None):