From 77acb809b98f1653706e5ff79c2ab027897a759d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 17:28:40 -0400 Subject: [PATCH] Update view references to include namespaces --- mayan/apps/document_acls/links.py | 2 +- mayan/apps/document_comments/__init__.py | 2 +- mayan/apps/document_comments/links.py | 8 ++++---- mayan/apps/document_signatures/__init__.py | 2 +- mayan/apps/document_signatures/links.py | 8 ++++---- mayan/apps/documents/links.py | 2 +- mayan/apps/documents/views.py | 2 +- mayan/apps/dynamic_search/models.py | 2 +- mayan/apps/history/models.py | 4 ++-- mayan/apps/history/views.py | 15 +++++++-------- mayan/apps/installation/__init__.py | 2 +- mayan/apps/installation/links.py | 6 +++--- mayan/apps/linking/__init__.py | 6 +++--- mayan/apps/linking/views.py | 6 +++--- mayan/apps/metadata/__init__.py | 12 ++++++------ mayan/apps/metadata/views.py | 8 ++++---- mayan/apps/ocr/links.py | 22 +++++++++++----------- mayan/apps/project_setup/api.py | 1 - mayan/apps/registration/links.py | 2 +- mayan/apps/scheduler/links.py | 2 +- 20 files changed, 56 insertions(+), 58 deletions(-) diff --git a/mayan/apps/document_acls/links.py b/mayan/apps/document_acls/links.py index 3c18710808..2e88554d06 100644 --- a/mayan/apps/document_acls/links.py +++ b/mayan/apps/document_acls/links.py @@ -4,4 +4,4 @@ from django.utils.translation import ugettext_lazy as _ from acls.permissions import ACLS_VIEW_ACL -acl_list = {'text': _(u'ACLs'), 'view': 'document_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +acl_list = {'text': _(u'ACLs'), 'view': 'document_acls:document_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} diff --git a/mayan/apps/document_comments/__init__.py b/mayan/apps/document_comments/__init__.py index 5f11dda8e0..d208415876 100644 --- a/mayan/apps/document_comments/__init__.py +++ b/mayan/apps/document_comments/__init__.py @@ -34,7 +34,7 @@ register_model_list_columns(Comment, [ } ]) -register_links(['comments_for_document', 'comment_add', 'comment_delete', 'comment_multiple_delete'], [comment_add], menu_name='sidebar') +register_links(['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'], [comment_add], menu_name='sidebar') register_links(Comment, [comment_delete]) register_links(Document, [comments_for_document], menu_name='form_header') diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index 588e03ea07..e9114c3d8f 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import (PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_VIEW) -comment_delete = {'text': _('delete'), 'view': 'comment_delete', 'args': 'object.pk', 'famfam': 'comment_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} -comment_multiple_delete = {'text': _('delete'), 'view': 'comment_multiple_delete', 'args': 'object.pk', 'famfam': 'comments_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} -comment_add = {'text': _('add comment'), 'view': 'comment_add', 'args': 'object.pk', 'famfam': 'comment_add', 'permissions': [PERMISSION_COMMENT_CREATE]} -comments_for_document = {'text': _('comments'), 'view': 'comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']} +comment_delete = {'text': _('delete'), 'view': 'comments:comment_delete', 'args': 'object.pk', 'famfam': 'comment_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} +comment_multiple_delete = {'text': _('delete'), 'view': 'comments:comment_multiple_delete', 'args': 'object.pk', 'famfam': 'comments_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} +comment_add = {'text': _('add comment'), 'view': 'comments:comment_add', 'args': 'object.pk', 'famfam': 'comment_add', 'permissions': [PERMISSION_COMMENT_CREATE]} +comments_for_document = {'text': _('comments'), 'view': 'comments:comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']} diff --git a/mayan/apps/document_signatures/__init__.py b/mayan/apps/document_signatures/__init__.py index a1daf2b36a..219e53e423 100644 --- a/mayan/apps/document_signatures/__init__.py +++ b/mayan/apps/document_signatures/__init__.py @@ -49,7 +49,7 @@ def document_post_save_hook(instance): register_links(Document, [document_verify], menu_name='form_header') -register_links(['document_verify', 'document_signature_upload', 'document_signature_download', 'document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar') +register_links(['document_signatures:document_verify', 'document_signatures:document_signature_upload', 'document_signatures:document_signature_download', 'document_signatures:document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar') DocumentVersion.register_pre_open_hook(1, document_pre_open_hook) DocumentVersion.register_post_save_hook(1, document_post_save_hook) diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py index 9e438b0300..bf13d66bf7 100644 --- a/mayan/apps/document_signatures/links.py +++ b/mayan/apps/document_signatures/links.py @@ -19,7 +19,7 @@ def doesnt_have_detached_signature(context): return DocumentVersionSignature.objects.has_detached_signature(context['object']) is False -document_signature_delete = {'text': _(u'delete signature'), 'view': 'document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature} -document_signature_download = {'text': _(u'download signature'), 'view': 'document_signature_download', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_SIGNATURE_DOWNLOAD], 'conditional_disable': doesnt_have_detached_signature} -document_signature_upload = {'text': _(u'upload signature'), 'view': 'document_signature_upload', 'args': 'object.pk', 'famfam': 'pencil_add', 'permissions': [PERMISSION_SIGNATURE_UPLOAD], 'conditional_disable': has_embedded_signature} -document_verify = {'text': _(u'signatures'), 'view': 'document_verify', 'args': 'object.pk', 'famfam': 'text_signature', 'permissions': [PERMISSION_DOCUMENT_VERIFY]} +document_signature_delete = {'text': _(u'delete signature'), 'view': 'signatures:document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature} +document_signature_download = {'text': _(u'download signature'), 'view': 'signatures:document_signature_download', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_SIGNATURE_DOWNLOAD], 'conditional_disable': doesnt_have_detached_signature} +document_signature_upload = {'text': _(u'upload signature'), 'view': 'signatures:document_signature_upload', 'args': 'object.pk', 'famfam': 'pencil_add', 'permissions': [PERMISSION_SIGNATURE_UPLOAD], 'conditional_disable': has_embedded_signature} +document_verify = {'text': _(u'signatures'), 'view': 'signatures:document_verify', 'args': 'object.pk', 'famfam': 'text_signature', 'permissions': [PERMISSION_DOCUMENT_VERIFY]} diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index a7ba1173fe..c7b82ddb02 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -52,7 +52,7 @@ document_update_page_count = {'text': _(u'update office documents\' page count') document_clear_transformations = {'text': _(u'clear transformations'), 'view': 'documents:document_clear_transformations', 'args': 'object.id', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_multiple_clear_transformations = {'text': _(u'clear transformations'), 'view': 'documents:document_multiple_clear_transformations', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_print = {'text': _(u'print'), 'view': 'documents:document_print', 'args': 'object.id', 'famfam': 'printer', 'permissions': [PERMISSION_DOCUMENT_VIEW]} -document_history_view = {'text': _(u'history'), 'view': 'history_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_HISTORY_VIEW]} +document_history_view = {'text': _(u'history'), 'view': 'history:history_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_HISTORY_VIEW]} document_missing_list = {'text': _(u'Find missing document files'), 'view': 'documents:document_missing_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_VIEW]} # Tools diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index f19c29c0d3..efa5def9eb 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -163,7 +163,7 @@ def document_delete(request, document_id=None, document_id_list=None): if document_id: documents = [get_object_or_404(Document, pk=document_id)] - post_action_redirect = reverse('document_list_recent') + post_action_redirect = reverse('documents:document_list_recent') elif document_id_list: documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] else: diff --git a/mayan/apps/dynamic_search/models.py b/mayan/apps/dynamic_search/models.py index 1a257b8817..7e1af27dba 100644 --- a/mayan/apps/dynamic_search/models.py +++ b/mayan/apps/dynamic_search/models.py @@ -49,7 +49,7 @@ class RecentSearch(models.Model): super(RecentSearch, self).save(*args, **kwargs) def url(self): - view = 'results' if self.is_advanced() else 'search' + view = 'search:results' if self.is_advanced() else 'search:search' return '%s?%s' % (reverse(view), self.query) def is_advanced(self): diff --git a/mayan/apps/history/models.py b/mayan/apps/history/models.py index 3d5de9636a..05da0eb60e 100644 --- a/mayan/apps/history/models.py +++ b/mayan/apps/history/models.py @@ -9,6 +9,7 @@ from django.core import serializers from django.db import models from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ +from django.core.urlresolvers import reverse from .runtime_data import history_types_dict @@ -23,9 +24,8 @@ class HistoryType(models.Model): except KeyError: return u'obsolete history type: %s - %s' % (self.namespace, self.name) - @models.permalink def get_absolute_url(self): - return ('history_type_list', [self.pk]) + return reverse('history:history_type_list', args=[self.pk]) class Meta: ordering = ('namespace', 'name') diff --git a/mayan/apps/history/views.py b/mayan/apps/history/views.py index 2e000b086d..90dbf1330b 100644 --- a/mayan/apps/history/views.py +++ b/mayan/apps/history/views.py @@ -1,20 +1,19 @@ from __future__ import absolute_import -from django.shortcuts import render_to_response -from django.template import RequestContext -from django.utils.translation import ugettext_lazy as _ -from django.shortcuts import get_object_or_404 from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import PermissionDenied from django.db.models.loading import get_model from django.http import Http404 -from django.core.exceptions import PermissionDenied +from django.shortcuts import get_object_or_404, render_to_response +from django.template import RequestContext +from django.utils.translation import ugettext_lazy as _ -from permissions.models import Permission -from common.utils import encapsulate from acls.models import AccessEntry +from common.utils import encapsulate +from permissions.models import Permission -from .models import History, HistoryType from .forms import HistoryDetailForm +from .models import History, HistoryType from .permissions import PERMISSION_HISTORY_VIEW from .widgets import history_entry_object_link diff --git a/mayan/apps/installation/__init__.py b/mayan/apps/installation/__init__.py index 56ff6fe18f..d83f958679 100644 --- a/mayan/apps/installation/__init__.py +++ b/mayan/apps/installation/__init__.py @@ -55,7 +55,7 @@ register_model_list_columns(Property, [ ]) register_links(PropertyNamespace, [link_namespace_details]) -register_links(['namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu') +register_links(['installation:namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu') register_tool(link_menu_link) diff --git a/mayan/apps/installation/links.py b/mayan/apps/installation/links.py index 42dac720f3..3ab19a85fd 100644 --- a/mayan/apps/installation/links.py +++ b/mayan/apps/installation/links.py @@ -4,6 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import PERMISSION_INSTALLATION_DETAILS -link_menu_link = {'text': _(u'installation details'), 'view': 'namespace_list', 'icon': 'interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} -link_namespace_list = {'text': _(u'installation property namespaces'), 'view': 'namespace_list', 'famfam': 'layout', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} -link_namespace_details = {'text': _(u'details'), 'view': 'namespace_details', 'args': 'object.id', 'famfam': 'layout_link', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_menu_link = {'text': _(u'installation details'), 'view': 'installation:namespace_list', 'icon': 'interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_namespace_list = {'text': _(u'installation property namespaces'), 'view': 'installation:namespace_list', 'famfam': 'layout', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_namespace_details = {'text': _(u'details'), 'view': 'installation:namespace_details', 'args': 'object.id', 'famfam': 'layout_link', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} diff --git a/mayan/apps/linking/__init__.py b/mayan/apps/linking/__init__.py index d116e5f667..bbcd5a9bb9 100644 --- a/mayan/apps/linking/__init__.py +++ b/mayan/apps/linking/__init__.py @@ -17,13 +17,13 @@ from .permissions import (PERMISSION_SMART_LINK_VIEW, register_links(Document, [smart_link_instances_for_document], menu_name='form_header') register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list, smart_link_acl_list]) -register_links([SmartLink, 'smart_link_list', 'smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') +register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete]) -register_links(['smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') +register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') register_setup(smart_link_setup) -register_sidebar_template(['smart_link_list'], 'smart_links_help.html') +register_sidebar_template(['linking:smart_link_list'], 'smart_links_help.html') class_permissions(SmartLink, [ PERMISSION_SMART_LINK_VIEW, diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 6698854218..3ba0de7824 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -98,7 +98,7 @@ def smart_link_instances_for_document(request, document_id): smart_link_instances=smart_link_instances, current_document=document, links=[smart_link_instance_view_link] ), - 'form_action': reverse('smart_link_action'), + 'form_action': reverse('linking:smart_link_action'), 'submit_method': 'GET', } }] @@ -148,7 +148,7 @@ def smart_link_create(request): document_group = form.save() apply_default_acls(document_group, request.user) messages.success(request, _(u'Smart link: %s created successfully.') % document_group) - return HttpResponseRedirect(reverse('smart_link_list')) + return HttpResponseRedirect(reverse('linking:smart_link_list')) else: form = SmartLinkForm() @@ -249,7 +249,7 @@ def smart_link_condition_create(request, smart_link_pk): new_smart_link_condition.smart_link = smart_link new_smart_link_condition.save() messages.success(request, _(u'Smart link condition: "%s" created successfully.') % new_smart_link_condition) - return HttpResponseRedirect(reverse('smart_link_condition_list', args=[smart_link.pk])) + return HttpResponseRedirect(reverse('linking:smart_link_condition_list', args=[smart_link.pk])) else: form = SmartLinkConditionForm(initial={'smart_link': smart_link}) diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py index d3f8b15dad..be713ca6de 100644 --- a/mayan/apps/metadata/__init__.py +++ b/mayan/apps/metadata/__init__.py @@ -21,20 +21,20 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE, PERMISSION_METADATA_DOCUMENT_VIEW) -register_links(['metadata_add', 'metadata_edit', 'metadata_remove', 'metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') +register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') register_links(Document, [metadata_view], menu_name='form_header') -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove]) register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_delete]) -register_links([MetadataType, 'setup_metadata_type_list', 'setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu') +register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu') register_links(MetadataSet, [setup_metadata_set_edit, setup_metadata_set_members, setup_metadata_set_delete]) -register_links([MetadataSet, 'setup_metadata_set_list', 'setup_metadata_set_create'], [setup_metadata_set_list, setup_metadata_set_create], menu_name='secondary_menu') +register_links([MetadataSet, 'metadata:setup_metadata_set_list', 'metadata:setup_metadata_set_create'], [setup_metadata_set_list, setup_metadata_set_create], menu_name='secondary_menu') register_links(DocumentType, [setup_document_type_metadata]) -register_sidebar_template(['setup_metadata_type_list'], 'metadata_type_help.html') -register_sidebar_template(['setup_metadata_set_list'], 'metadata_set_help.html') +register_sidebar_template(['metadata:setup_metadata_type_list'], 'metadata_type_help.html') +register_sidebar_template(['metadata:setup_metadata_set_list'], 'metadata_set_help.html') register_setup(setup_metadata_type_list) register_setup(setup_metadata_set_list) diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index f54602c215..fd0fe6c893 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -157,7 +157,7 @@ def metadata_add(request, document_id=None, document_id_list=None): ) elif len(documents) > 1: return HttpResponseRedirect(u'%s?%s' % ( - reverse('metadata_multiple_edit'), + reverse('metadata:metadata_multiple_edit'), urlencode({'id_list': document_id_list, 'next': next})) ) @@ -311,7 +311,7 @@ def setup_metadata_type_edit(request, metadatatype_id): try: form.save() messages.success(request, _(u'Metadata type edited successfully')) - return HttpResponseRedirect(reverse('setup_metadata_type_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_type_list')) except Exception as exception: messages.error(request, _(u'Error editing metadata type; %s') % exception) pass @@ -334,7 +334,7 @@ def setup_metadata_type_create(request): if form.is_valid(): form.save() messages.success(request, _(u'Metadata type created successfully')) - return HttpResponseRedirect(reverse('setup_metadata_type_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_type_list')) else: form = MetadataTypeForm() @@ -474,7 +474,7 @@ def setup_metadata_set_create(request): if form.is_valid(): form.save() messages.success(request, _(u'Metadata set created successfully')) - return HttpResponseRedirect(reverse('setup_metadata_set_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_set_list')) else: form = MetadataSetForm() diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 2cebdead18..411e961c0a 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -6,17 +6,17 @@ from .permissions import (PERMISSION_OCR_DOCUMENT, PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE, PERMISSION_OCR_CLEAN_ALL_PAGES) -submit_document = {'text': _('submit to OCR queue'), 'view': 'submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -re_queue_document = {'text': _('re-queue'), 'view': 're_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -re_queue_multiple_document = {'text': _('re-queue'), 'view': 're_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -queue_document_delete = {'text': _(u'delete'), 'view': 'queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} -queue_document_multiple_delete = {'text': _(u'delete'), 'view': 'queue_document_multiple_delete', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} +submit_document = {'text': _('submit to OCR queue'), 'view': 'ocr:submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'ocr:submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +re_queue_document = {'text': _('re-queue'), 'view': 'ocr:re_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +re_queue_multiple_document = {'text': _('re-queue'), 'view': 'ocr:re_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +queue_document_delete = {'text': _(u'delete'), 'view': 'ocr:queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} +queue_document_multiple_delete = {'text': _(u'delete'), 'view': 'ocr:queue_document_multiple_delete', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} -document_queue_disable = {'text': _(u'stop queue'), 'view': 'document_queue_disable', 'args': 'queue.id', 'famfam': 'control_stop_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} -document_queue_enable = {'text': _(u'activate queue'), 'view': 'document_queue_enable', 'args': 'queue.id', 'famfam': 'control_play_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} +document_queue_disable = {'text': _(u'stop queue'), 'view': 'ocr:document_queue_disable', 'args': 'queue.id', 'famfam': 'control_stop_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} +document_queue_enable = {'text': _(u'activate queue'), 'view': 'ocr:document_queue_enable', 'args': 'queue.id', 'famfam': 'control_play_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} -all_document_ocr_cleanup = {'text': _(u'clean up pages content'), 'view': 'all_document_ocr_cleanup', 'famfam': 'text_strikethrough', 'permissions': [PERMISSION_OCR_CLEAN_ALL_PAGES], 'description': _(u'Runs a language filter to remove common OCR mistakes from document pages content.')} +all_document_ocr_cleanup = {'text': _(u'clean up pages content'), 'view': 'ocr:all_document_ocr_cleanup', 'famfam': 'text_strikethrough', 'permissions': [PERMISSION_OCR_CLEAN_ALL_PAGES], 'description': _(u'Runs a language filter to remove common OCR mistakes from document pages content.')} -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], 'children_view_regex': [r'queue_', r'document_queue']} +queue_document_list = {'text': _(u'queue document list'), 'view': 'ocr:queue_document_list', 'famfam': 'hourglass', 'permissions': [PERMISSION_OCR_DOCUMENT]} +ocr_tool_link = {'text': _(u'OCR'), 'view': 'ocr:queue_document_list', 'famfam': 'hourglass', 'icon': 'text.png', 'permissions': [PERMISSION_OCR_DOCUMENT], 'children_view_regex': [r'queue_', r'document_queue']} diff --git a/mayan/apps/project_setup/api.py b/mayan/apps/project_setup/api.py index f1dd99a4b3..1d11179701 100644 --- a/mayan/apps/project_setup/api.py +++ b/mayan/apps/project_setup/api.py @@ -6,7 +6,6 @@ setup_items = [] def register_setup(link): - print "link", link setup_items.append(link) # Append the link's children_view_regex to the setup main menu children view regex diff --git a/mayan/apps/registration/links.py b/mayan/apps/registration/links.py index 9c188473e6..ee0da876a8 100644 --- a/mayan/apps/registration/links.py +++ b/mayan/apps/registration/links.py @@ -9,4 +9,4 @@ def is_not_registered(context): return RegistrationSingleton.registration_state() is False -form_view = {'text': _('Registration'), 'view': 'form_view', 'famfam': 'telephone', 'condition': is_not_registered} +form_view = {'text': _('Registration'), 'view': 'registration:form_view', 'famfam': 'telephone', 'condition': is_not_registered} diff --git a/mayan/apps/scheduler/links.py b/mayan/apps/scheduler/links.py index 7190be22f9..a92431eb1a 100644 --- a/mayan/apps/scheduler/links.py +++ b/mayan/apps/scheduler/links.py @@ -4,4 +4,4 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import PERMISSION_VIEW_JOB_LIST -job_list = {'text': _(u'interval job list'), 'view': 'job_list', 'icon': 'time.png', 'permissions': [PERMISSION_VIEW_JOB_LIST]} +job_list = {'text': _(u'interval job list'), 'view': 'scheduler:job_list', 'icon': 'time.png', 'permissions': [PERMISSION_VIEW_JOB_LIST]}