matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve document version views navigation and active menu feedback

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-04 06:16:37 -04:00
parent 071139c5bf
commit 24f443fe1a
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sources/__init__.py
View File

@@ -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')

4
apps/sources/urls.py
View File

@@ -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/$', '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_version'),
#Setup views

4
apps/sources/views.py
View File

@@ -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': {