Fix outdated references to non namespaced app views

mayan/apps/documents/__init__.py

@@ -59,19 +59,19 @@ register_history_type(HISTORY_DOCUMENT_DELETED)
 register_links(DocumentType, [document_type_edit, document_type_delete, document_type_filename_list])
 register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete])
 
-register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu')
-register_links([DocumentTypeFilename, 'document_type_filename_list', 'document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
+register_links(['documents:setup_document_type_metadata', 'documents:document_type_filename_delete', 'documents:document_type_create', 'documents:document_type_filename_create', 'documents:document_type_filename_edit', 'documents:document_type_filename_list', 'documents:document_type_list', 'documents:document_type_edit', 'documents:document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu')
+register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
 
 # Register document links
 register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations])
-register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download])
+register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download])
 
 # Document Version links
 register_links(DocumentVersion, [document_version_revert, document_version_download])
 
 secondary_menu_links = [document_list_recent, document_list]
 
-register_links(['document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
+register_links(['documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
 register_links(Document, secondary_menu_links, menu_name='secondary_menu')
 
 # Document page links
@@ -86,12 +86,12 @@ register_links(DocumentPage, [
     document_page_navigation_next, document_page_navigation_last
 ], menu_name='related')
 
-register_links(['document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header')
+register_links(['documents:document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header')
 
 register_links(DocumentPageTransformation, [document_page_transformation_edit, document_page_transformation_delete])
-register_links('document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar')
-register_links('document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar')
-register_links(['document_page_transformation_edit', 'document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar')
+register_links('documents:document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar')
+register_links('documents:document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar')
+register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar')
 
 register_diagnostic('documents', _(u'Documents'), document_missing_list)
 
@@ -100,7 +100,7 @@ register_maintenance_links([document_find_all_duplicates, document_update_page_c
 register_model_list_columns(Document, [
     {
         'name': _(u'thumbnail'), 'attribute':
-        encapsulate(lambda x: document_thumbnail(x, gallery_name='document_list', title=getattr(x, 'filename', None), size=THUMBNAIL_SIZE))
+        encapsulate(lambda x: document_thumbnail(x, gallery_name='documents:document_list', title=getattr(x, 'filename', None), size=THUMBNAIL_SIZE))
     },
 ])
 
@@ -110,13 +110,13 @@ register_top_menu(
     children_path_regex=[
         r'^documents/[^t]', r'^metadata/[^s]', r'comments', r'tags/document', r'grouping/[^s]', r'history/list/for_object/documents',
     ],
-    children_view_regex=[r'document_acl', r'smart_link_instance'],
-    children_views=['document_folder_list', 'folder_add_document', 'document_index_list', 'upload_version', ],
+    children_view_regex=[r'documents:document_acl', r'smart_link_instance'],
+    children_views=['documents:document_folder_list', 'folders:folder_add_document', 'documents:document_index_list', 'documents:upload_version', ],
     position=1
 )
 
-register_sidebar_template(['document_list_recent'], 'recent_document_list_help.html')
-register_sidebar_template(['document_type_list'], 'document_types_help.html')
+register_sidebar_template(['documents:document_list_recent'], 'recent_document_list_help.html')
+register_sidebar_template(['documents:document_type_list'], 'document_types_help.html')
 
 register_links(Document, [document_view_simple], menu_name='form_header', position=0)
 register_links(Document, [document_view_advanced], menu_name='form_header', position=1)

mayan/apps/navigation/templatetags/navigation_tags.py

@@ -78,6 +78,7 @@ def resolve_links(context, links, current_view, current_path, parsed_query_strin
     """
     Express a list of links from definition to final values
     """
+
     context_links = []
     for link in links:
         # Check to see if link has conditional display

mayan/apps/sources/__init__.py

@@ -25,12 +25,12 @@ register_links([StagingFile], [staging_file_delete])
 
 register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete])
 
-register_links(['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_create'], [setup_web_form_list, setup_staging_folder_list], menu_name='form_header')
+register_links(['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_create'], [setup_web_form_list, setup_staging_folder_list], menu_name='form_header')
 
 register_links(WebForm, [setup_web_form_list, setup_staging_folder_list], menu_name='form_header')
 register_links(WebForm, [setup_source_transformation_list, setup_source_edit, setup_source_delete])
 
-register_links(['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_edit', 'setup_source_delete', 'setup_source_create'], [setup_sources, setup_source_create], menu_name='sidebar')
+register_links(['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_edit', 'sources:setup_source_delete', 'sources:setup_source_create'], [setup_sources, setup_source_create], menu_name='sidebar')
 
 register_links(StagingFolder, [setup_web_form_list, setup_staging_folder_list], menu_name='form_header')
 register_links(StagingFolder, [setup_source_transformation_list, setup_source_edit, setup_source_delete])
@@ -39,22 +39,22 @@ register_links(WatchFolder, [setup_web_form_list, setup_staging_folder_list, set
 register_links(WatchFolder, [setup_source_transformation_list, setup_source_edit, setup_source_delete])
 
 # Document version
-register_links(['document_version_list', 'upload_version', 'document_version_revert'], [upload_version], menu_name='sidebar')
+register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar')
 
-register_links(['setup_source_transformation_create', 'setup_source_transformation_edit', 'setup_source_transformation_delete', 'setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
+register_links(['sources:setup_source_transformation_create', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
 
-source_views = ['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_edit', 'setup_source_delete', 'setup_source_create', 'setup_source_transformation_list', 'setup_source_transformation_edit', 'setup_source_transformation_delete', 'setup_source_transformation_create']
+source_views = ['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_edit', 'sources:setup_source_delete', 'sources:setup_source_create', 'sources:setup_source_transformation_list', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_create']
 
 register_model_list_columns(StagingFile, [
     {
         'name': _(u'thumbnail'), 'attribute':
-        encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='staging_list', title=x.filename, size='100'))
+        encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='sources:staging_list', title=x.filename, size='100'))
     },
 ])
 
 register_setup(setup_sources)
 
-register_links([Document, 'document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], [document_create_multiple], menu_name='secondary_menu')
+register_links([Document, 'documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], [document_create_multiple], menu_name='secondary_menu')
 register_links(Document, [document_create_siblings])
 
 endpoint = APIEndPoint('sources')

mayan/apps/sources/views.py

@@ -45,7 +45,7 @@ def document_create_siblings(request, document_id):
     if document.document_type_id:
         query_dict['document_type_id'] = document.document_type_id
 
-    url = reverse('upload_interactive')
+    url = reverse('sources:upload_interactive')
     return HttpResponseRedirect('%s?%s' % (url, urlencode(query_dict)))
 
 
@@ -58,7 +58,7 @@ def get_tab_link_for_source(source, document=None):
         view = u'upload_version'
         args = [document.pk, u'"%s"' % source.source_type, source.pk]
     else:
-        view = u'upload_interactive'
+        view = u'sources:upload_interactive'
         args = [u'"%s"' % source.source_type, source.pk]
 
     return {
@@ -322,7 +322,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No
                 'upload_version': {
                     'links': results['tab_links']
                 },
-                'upload_interactive': {
+                'sources:upload_interactive': {
                     'links': results['tab_links']
                 }
             }

mayan/apps/sources/wizards.py

@@ -89,5 +89,5 @@ class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView):
         except TypeError:
             pass
 
-        url = '?'.join([reverse('upload_interactive'), urlencode(query_dict, doseq=True)])
+        url = '?'.join([reverse('sources:upload_interactive'), urlencode(query_dict, doseq=True)])
         return HttpResponseRedirect(url)