diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index 668e20b4b6..5f160d4fce 100644 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -43,8 +43,6 @@ all_document_ocr_cleanup = {'text': _(u'clean up pages content'), 'view': 'all_d queue_document_list = {'text': _(u'queue document list'), 'view': 'queue_document_list', 'famfam': 'hourglass', 'permissions': [PERMISSION_OCR_DOCUMENT]} ocr_tool_link = {'text': _(u'OCR'), 'view': 'queue_document_list', 'famfam': 'hourglass', 'icon': 'text.png', 'permissions': [PERMISSION_OCR_DOCUMENT]} -node_active_list = {'text': _(u'active tasks'), 'view': 'node_active_list', 'famfam': 'server_chart', 'permissions': [PERMISSION_OCR_DOCUMENT]} - setup_queue_transformation_list = {'text': _(u'transformations'), 'view': 'setup_queue_transformation_list', 'args': 'queue.pk', 'famfam': 'shape_move_front'} setup_queue_transformation_create = {'text': _(u'add transformation'), 'view': 'setup_queue_transformation_create', 'args': 'queue.pk', 'famfam': 'shape_square_add'} setup_queue_transformation_edit = {'text': _(u'edit'), 'view': 'setup_queue_transformation_edit', 'args': 'transformation.pk', 'famfam': 'shape_square_edit'} @@ -58,7 +56,7 @@ register_links(QueueTransformation, [setup_queue_transformation_edit, setup_queu register_multi_item_links(['queue_document_list'], [re_queue_multiple_document, queue_document_multiple_delete]) -register_links(['setup_queue_transformation_create', 'setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'document_queue_disable', 'document_queue_enable', 'queue_document_list', 'node_active_list', 'setup_queue_transformation_list'], [queue_document_list, node_active_list], menu_name='secondary_menu') +register_links(['setup_queue_transformation_create', 'setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'document_queue_disable', 'document_queue_enable', 'queue_document_list', 'setup_queue_transformation_list'], [queue_document_list], menu_name='secondary_menu') register_links(['setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'setup_queue_transformation_list', 'setup_queue_transformation_create'], [setup_queue_transformation_create], menu_name='sidebar') register_maintenance_links([all_document_ocr_cleanup], namespace='ocr', title=_(u'OCR')) diff --git a/apps/ocr/urls.py b/apps/ocr/urls.py index dd8529119b..d77be818f8 100644 --- a/apps/ocr/urls.py +++ b/apps/ocr/urls.py @@ -13,7 +13,6 @@ urlpatterns = patterns('ocr.views', url(r'^queue/(?P\d+)/disable/$', 'document_queue_disable', (), 'document_queue_disable'), url(r'^document/all/clean_up/$', 'all_document_ocr_cleanup', (), 'all_document_ocr_cleanup'), - url(r'^node/active/list/$', 'node_active_list', (), 'node_active_list'), url(r'^queue/(?P\d+)/transformation/list/$', 'setup_queue_transformation_list', (), 'setup_queue_transformation_list'), url(r'^queue/(?P\w+)/transformation/create/$', 'setup_queue_transformation_create', (), 'setup_queue_transformation_create'), diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 7083fb817c..fbeafc7b3a 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -302,42 +302,6 @@ def display_link(obj): return obj -def node_active_list(request): - Permission.objects.check_permissions(request.user, [PERMISSION_OCR_DOCUMENT]) - - i = inspect() - active_tasks = [] - try: - active_nodes = i.active() - if active_nodes: - for node, tasks in active_nodes.items(): - for task in tasks: - task_info = { - 'node': node, - 'task_name': task['name'], - 'task_id': task['id'], - 'related_object': None, - } - if task['name'] == u'ocr.tasks.task_process_queue_document': - task_info['related_object'] = QueueDocument.objects.get(pk=eval(task['args'])[0]).document - active_tasks.append(task_info) - except socket.error: - active_tasks = [] - - return render_to_response('generic_list.html', { - 'object_list': active_tasks, - 'title': _(u'active tasks'), - 'hide_links': True, - 'hide_object': True, - 'extra_columns': [ - {'name': _(u'node'), 'attribute': 'node'}, - {'name': _(u'task id'), 'attribute': 'task_id'}, - {'name': _(u'task name'), 'attribute': 'task_name'}, - {'name': _(u'related object'), 'attribute': lambda x: display_link(x['related_object']) if x['related_object'] else u''} - ], - }, context_instance=RequestContext(request)) - - # Setup views def setup_queue_transformation_list(request, document_queue_id): Permission.objects.check_permissions(request.user, [PERMISSION_OCR_QUEUE_EDIT])