Improve document version views navigation and active menu feedback

apps/documents/__init__.py

@@ -75,7 +75,7 @@ register_history_type(HISTORY_DOCUMENT_DELETED)
 
 document_list = {'text': _(u'all documents'), 'view': 'document_list', 'famfam': 'page', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_list_recent = {'text': _(u'recent documents'), 'view': 'document_list_recent', 'famfam': 'page', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
-document_create_multiple = {'text': _(u'upload new documents'), 'view': 'document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': ['upload']}
+document_create_multiple = {'text': _(u'upload new documents'), 'view': 'document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']}
 document_create_siblings = {'text': _(u'clone metadata'), 'view': 'document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
 document_view_simple = {'text': _(u'details'), 'view': 'document_view_simple', 'args': 'object.id', 'famfam': 'page', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_view_advanced = {'text': _(u'properties'), 'view': 'document_view_advanced', 'args': 'object.id', 'famfam': 'page_gear', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
@@ -204,6 +204,7 @@ 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'upload'],
     children_views=['document_folder_list', 'folder_add_document', 'document_index_list'],
     position=1
 )

apps/documents/views.py

@@ -1198,10 +1198,10 @@ def document_version_revert(request, document_version_pk):
     check_permissions(request.user, [PERMISSION_DOCUMENT_VERSION_REVERT])
 
     previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
+    document_version = get_object_or_404(DocumentVersion, pk=document_version_pk)
 
     if request.method == 'POST':
         try:
-            document_version = get_object_or_404(DocumentVersion, pk=document_version_pk)
             document_version.revert()
             messages.success(request, _(u'Document version reverted successfully'))
         except Exception, msg:
@@ -1211,6 +1211,7 @@ def document_version_revert(request, document_version_pk):
 
     return render_to_response('generic_confirm.html', {
         'previous': previous,
+        'object': document_version.document,
         'title': _(u'Are you sure you wish to revert to this version?'),
         'message': _(u'All later version after this one will be deleted too.'),
         'form_icon': u'page_refresh.png',

apps/main/__init__.py

@@ -21,7 +21,7 @@ __version_info__ = {
     'minor': 11,
     'micro': 0,
     'releaselevel': 'beta',
-    'serial': 2
+    'serial': 3
 }
 
 

apps/sources/__init__.py

@@ -43,7 +43,7 @@ setup_source_transformation_delete = {'text': _(u'delete'), 'view': 'setup_sourc
 
 source_list = {'text': _(u'Document sources'), 'view': 'setup_web_form_list', 'famfam': 'page_add', 'children_url_regex': [r'sources/setup']}
 
-upload_interactive_version = {'text': _(u'upload new version'), 'view': 'upload_interactive_version', 'args': 'object.pk', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
+upload_version = {'text': _(u'upload new version'), 'view': 'upload_version', 'args': 'object.pk', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
 
 register_links(StagingFile, [staging_file_delete])
 
@@ -66,7 +66,7 @@ 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, [upload_interactive_version])
+register_links(['document_version_list', 'upload_version', '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')
 

apps/sources/urls.py

@@ -11,8 +11,8 @@ urlpatterns = patterns('sources.views',
     url(r'^upload/document/new/interactive/(?P<source_type>\w+)/(?P<source_id>\d+)/$', 'upload_interactive', (), 'upload_interactive'),
     url(r'^upload/document/new/interactive/$', 'upload_interactive', (), 'upload_interactive'),
 
-    url(r'^upload/document/(?P<document_pk>\d+)/version/interactive/(?P<source_type>\w+)/(?P<source_id>\d+)/$', 'upload_interactive', (), 'upload_interactive_version'),
+    url(r'^upload/document/(?P<document_pk>\d+)/version/interactive/(?P<source_type>\w+)/(?P<source_id>\d+)/$', 'upload_interactive', (), 'upload_version'),
-    url(r'^upload/document/(?P<document_pk>\d+)/version/interactive/$', 'upload_interactive', (), 'upload_interactive_version'),
+    url(r'^upload/document/(?P<document_pk>\d+)/version/interactive/$', 'upload_interactive', (), 'upload_version'),
 
     #Setup views
 

apps/sources/views.py

@@ -37,7 +37,7 @@ def return_function(obj):
 
 def get_tab_link_for_source(source, document=None):
     if document:
-        view = u'upload_interactive_version'
+        view = u'upload_version'
         args = [document.pk, u'"%s"' % source.source_type, source.pk]
     else:
         view = u'upload_interactive'
@@ -271,7 +271,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No
         'subtemplates_list': subtemplates_list,
         'temporary_navigation_links': {
             'form_header': {
-                'upload_interactive_version': {
+                'upload_version': {
                     'links': results['tab_links']
                 },
                 'upload_interactive': {