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

With full document OCR queue and per document type OCR queuing, re_queueing OCR errors is redundant, removing.

Browse Source
This commit is contained in:
Roberto Rosario
2015-10-21 03:58:09 -04:00
parent da0134a7fb
commit 71ac2cbf79
4 changed files with 3 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/ocr/apps.py
View File

@@ -28,7 +28,7 @@ from .links import (
link_document_content, link_document_submit, link_document_submit_all,
link_document_submit_multiple, link_document_type_ocr_settings,
link_document_type_submit, link_entry_delete, link_entry_delete_multiple,
link_entry_list, link_entry_re_queue, link_entry_re_queue_multiple
link_entry_list
)
from .models import DocumentVersionOCRError
from .permissions import permission_ocr_document, permission_ocr_content_view
@@ -108,15 +108,14 @@ class OCRApp(MayanAppConfig):
links=(link_document_submit_multiple,), sources=(Document,)
)
menu_multi_item.bind_links(
links=(link_entry_re_queue_multiple, link_entry_delete_multiple),
links=(link_entry_delete_multiple,),
sources=(DocumentVersionOCRError,)
)
menu_object.bind_links(
links=(link_document_submit,), sources=(Document,)
)
menu_object.bind_links(
links=(link_entry_re_queue, link_entry_delete),
sources=(DocumentVersionOCRError,)
links=(link_entry_delete,), sources=(DocumentVersionOCRError,)
)
menu_object.bind_links(
links=(link_document_type_ocr_settings,), sources=(DocumentType,)

7
mayan/apps/ocr/links.py
View File

@@ -43,10 +43,3 @@ link_entry_list = Link(
icon='fa fa-file-text-o', permissions=(permission_ocr_document,),
text=_('OCR errors'), view='ocr:entry_list'
)
link_entry_re_queue = Link(
permissions=(permission_ocr_document,), text=_('Re-queue'),
view='ocr:entry_re_queue', args='object.id'
)
link_entry_re_queue_multiple = Link(
text=_('Re-queue'), view='ocr:entry_re_queue_multiple'
)

5
mayan/apps/ocr/urls.py
View File

@@ -44,11 +44,6 @@ urlpatterns = patterns(
r'^multiple/delete/$', 'entry_delete_multiple',
name='entry_delete_multiple'
),
url(r'^(?P<pk>\d+)/re-queue/$', 'entry_re_queue', name='entry_re_queue'),
url(
r'^multiple/re-queue/$', 'entry_re_queue_multiple',
name='entry_re_queue_multiple'
),
)
api_urls = patterns(

56
mayan/apps/ocr/views.py
View File

@@ -237,59 +237,3 @@ def entry_delete(request, pk=None, pk_list=None):
def entry_delete_multiple(request):
return entry_delete(request, pk_list=request.GET.get('id_list', ''))
def entry_re_queue(request, pk=None, pk_list=None):
Permission.check_permissions(request.user, (permission_ocr_document,))
if pk:
entries = [get_object_or_404(DocumentVersionOCRError, pk=pk)]
elif pk_list:
entries = [get_object_or_404(DocumentVersionOCRError, pk=pk) for pk in pk_list.split(',')]
else:
messages.error(request, _('Make at least one selection.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST':
for entry in entries:
try:
entry.document_version.submit_for_ocr()
messages.success(
request,
_('Entry: %(entry)s was re-queued for OCR.') % {
'entry': entry
}
)
except DocumentVersion.DoesNotExist:
messages.error(
request, _(
'Document version id#: %d, no longer exists.'
) % entry.document_version_id
)
return HttpResponseRedirect(next)
context = {
'next': next,
'previous': previous,
}
if len(entries) == 1:
context['object'] = entries[0]
context['title'] = ungettext(
'Re-queue the selected entry?',
'Re-queue the selected entries?',
len(entries)
)
return render_to_response(
'appearance/generic_confirm.html', context,
context_instance=RequestContext(request)
)
def entry_re_queue_multiple(request):
return entry_re_queue(request, pk_list=request.GET.get('id_list', []))