From 71ac2cbf7935de4ee9397b872fd1e3e44f4b0ce3 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 21 Oct 2015 03:58:09 -0400
Subject: [PATCH] With full document OCR queue and per document type OCR
 queuing, re_queueing OCR errors is redundant, removing.

---
 mayan/apps/ocr/apps.py  |  7 +++---
 mayan/apps/ocr/links.py |  7 ------
 mayan/apps/ocr/urls.py  |  5 ----
 mayan/apps/ocr/views.py | 56 -----------------------------------------
 4 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py
index f2ec4a04c5..00697eb666 100644
--- a/mayan/apps/ocr/apps.py
+++ b/mayan/apps/ocr/apps.py
@@ -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,)
diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py
index 8251349dd1..4fb532f37b 100644
--- a/mayan/apps/ocr/links.py
+++ b/mayan/apps/ocr/links.py
@@ -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'
-)
diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py
index 554e3fced8..ca896f88d6 100644
--- a/mayan/apps/ocr/urls.py
+++ b/mayan/apps/ocr/urls.py
@@ -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(
diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py
index 78d5e11361..4fe6c7d9fc 100644
--- a/mayan/apps/ocr/views.py
+++ b/mayan/apps/ocr/views.py
@@ -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', []))