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

Replace unnecessary lists with tuples.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-28 00:49:07 -04:00
parent 1e746c700a
commit 54f3cef7ba
14 changed files with 93 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/acls/apps.py
View File

@@ -16,9 +16,9 @@ class ACLsApp(MayanAppConfig):
super(ACLsApp, self).ready()
menu_object.bind_links(
links=[link_acl_permissions, link_acl_delete],
sources=[AccessControlList]
links=(link_acl_permissions, link_acl_delete),
sources=(AccessControlList,)
)
menu_sidebar.bind_links(
links=[link_acl_new], sources=['acls:acl_list']
links=(link_acl_new,), sources=('acls:acl_list',)
)

8
mayan/apps/acls/links.py
View File

@@ -21,18 +21,18 @@ def get_kwargs_factory(variable_name):
link_acl_delete = Link(
permissions=[permission_acl_edit], tags='dangerous', text=_('Delete'),
permissions=(permission_acl_edit,), tags='dangerous', text=_('Delete'),
view='acls:acl_delete', args='resolved_object.pk'
)
link_acl_list = Link(
permissions=[permission_acl_view], text=_('ACLs'), view='acls:acl_list',
permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list',
kwargs=get_kwargs_factory('resolved_object')
)
link_acl_new = Link(
permissions=[permission_acl_edit], text=_('New ACL'),
permissions=(permission_acl_edit,), text=_('New ACL'),
view='acls:acl_new', kwargs=get_kwargs_factory('resolved_object')
)
link_acl_permissions = Link(
permissions=[permission_acl_edit], text=_('Permissions'),
permissions=(permission_acl_edit,), text=_('Permissions'),
view='acls:acl_permissions', args='resolved_object.pk'
)

8
mayan/apps/authentication/apps.py
View File

@@ -19,14 +19,14 @@ class AuthenticationApp(MayanAppConfig):
super(AuthenticationApp, self).ready()
menu_secondary.bind_links(
links=[
links=(
link_password_change, link_logout
],
sources=[
),
sources=(
'common:current_user_details', 'common:current_user_edit',
'common:current_user_locale_profile_details',
'common:current_user_locale_profile_edit',
'authentication:password_change_view',
'common:setup_list', 'common:tools_list'
]
)
)

10
mayan/apps/checkouts/apps.py
View File

@@ -88,14 +88,14 @@ class CheckoutsApp(MayanAppConfig):
}
)
menu_facet.bind_links(links=[link_checkout_info], sources=[Document])
menu_main.bind_links(links=[link_checkout_list])
menu_facet.bind_links(links=(link_checkout_info,), sources=(Document,))
menu_main.bind_links(links=(link_checkout_list,))
menu_sidebar.bind_links(
links=[link_checkout_document, link_checkin_document],
sources=[
links=(link_checkout_document, link_checkin_document),
sources=(
'checkouts:checkout_info', 'checkouts:checkout_document',
'checkouts:checkin_document'
]
)
)
pre_save.connect(

10
mayan/apps/checkouts/links.py
View File

@@ -23,19 +23,19 @@ link_checkout_list = Link(
view='checkouts:checkout_list'
)
link_checkout_document = Link(
condition=is_not_checked_out, permissions=[permission_document_checkout],
condition=is_not_checked_out, permissions=(permission_document_checkout,),
text=_('Check out document'), view='checkouts:checkout_document',
args='object.pk'
)
link_checkin_document = Link(
condition=is_checked_out, permissions=[
condition=is_checked_out, permissions=(
permission_document_checkin, permission_document_checkin_override
], text=_('Check in document'), view='checkouts:checkin_document',
), text=_('Check in document'), view='checkouts:checkin_document',
args='object.pk'
)
link_checkout_info = Link(
permissions=[
permissions=(
permission_document_checkin, permission_document_checkin_override,
permission_document_checkout
], text=_('Check in/out'), view='checkouts:checkout_info', args='object.pk'
), text=_('Check in/out'), view='checkouts:checkout_info', args='object.pk'
)

18
mayan/apps/common/apps.py
View File

@@ -67,34 +67,34 @@ class CommonApp(MayanAppConfig):
app.conf.CELERY_DEFAULT_QUEUE = 'default'
menu_facet.bind_links(
links=[
links=(
link_current_user_details,
link_current_user_locale_profile_details, link_tools,
link_setup
], sources=[
), sources=(
'common:current_user_details', 'common:current_user_edit',
'common:current_user_locale_profile_details',
'common:current_user_locale_profile_edit',
'authentication:password_change_view', 'common:setup_list',
'common:tools_list'
]
)
)
menu_main.bind_links(links=[link_about], position=-1)
menu_secondary.bind_links(
links=[link_about, link_license],
sources=['common:about_view', 'common:license_view']
links=(link_about, link_license),
sources=('common:about_view', 'common:license_view')
)
menu_secondary.bind_links(
links=[
links=(
link_current_user_edit, link_current_user_locale_profile_edit
],
sources=[
),
sources=(
'common:current_user_details', 'common:current_user_edit',
'common:current_user_locale_profile_details',
'common:current_user_locale_profile_edit',
'authentication:password_change_view', 'common:setup_list',
'common:tools_list'
]
)
)
user_logged_in.connect(
user_locale_profile_session_config,

12
mayan/apps/converter/apps.py
View File

@@ -19,16 +19,16 @@ class ConverterApp(MayanAppConfig):
super(ConverterApp, self).ready()
menu_sidebar.bind_links(
links=[link_transformation_create], sources=[Transformation]
links=(link_transformation_create,), sources=(Transformation,)
)
menu_sidebar.bind_links(
links=[link_transformation_create],
sources=[
links=(link_transformation_create,),
sources=(
'converter:transformation_create',
'converter:transformation_list'
]
)
)
menu_object.bind_links(
links=[link_transformation_edit, link_transformation_delete],
sources=[Transformation]
links=(link_transformation_edit, link_transformation_delete),
sources=(Transformation,)
)

6
mayan/apps/converter/links.py
View File

@@ -31,15 +31,15 @@ link_transformation_create = Link(
text=_('Create new transformation'), view='converter:transformation_create'
)
link_transformation_delete = Link(
args='resolved_object.pk', permissions=[permission_transformation_delete],
args='resolved_object.pk', permissions=(permission_transformation_delete,),
tags='dangerous', text=_('Delete'), view='converter:transformation_delete'
)
link_transformation_edit = Link(
args='resolved_object.pk', permissions=[permission_transformation_edit],
args='resolved_object.pk', permissions=(permission_transformation_edit,),
text=_('Edit'), view='converter:transformation_edit'
)
link_transformation_list = Link(
kwargs=get_kwargs_factory('resolved_object'),
permissions=[permission_transformation_view], text=_('Transformations'),
permissions=(permission_transformation_view,), text=_('Transformations'),
view='converter:transformation_list'
)

12
mayan/apps/django_gpg/apps.py
View File

@@ -19,13 +19,13 @@ class DjangoGPGApp(MayanAppConfig):
def ready(self):
super(DjangoGPGApp, self).ready()
menu_object.bind_links(links=[link_key_delete], sources=[Key])
menu_object.bind_links(links=[link_key_receive], sources=[KeyStub])
menu_setup.bind_links(links=[link_key_setup])
menu_object.bind_links(links=(link_key_delete,), sources=(Key,))
menu_object.bind_links(links=(link_key_receive,), sources=(KeyStub,))
menu_setup.bind_links(links=(link_key_setup,))
menu_sidebar.bind_links(
links=[link_public_keys, link_key_query],
sources=[
links=(link_public_keys, link_key_query),
sources=(
'django_gpg:key_delete', 'django_gpg:key_public_list',
'django_gpg:key_query'
]
)
)

12
mayan/apps/django_gpg/links.py
View File

@@ -10,27 +10,27 @@ from .permissions import (
)
link_private_keys = Link(
icon='fa fa-key', permissions=[permission_key_view],
icon='fa fa-key', permissions=(permission_key_view,),
text=_('Private keys'), view='django_gpg:key_private_list'
)
link_public_keys = Link(
icon='fa fa-key', permissions=[permission_key_view], text=_('Public keys'),
icon='fa fa-key', permissions=(permission_key_view,), text=_('Public keys'),
view='django_gpg:key_public_list'
)
link_key_delete = Link(
permissions=[permission_key_delete], tags='dangerous', text=_('Delete'),
permissions=(permission_key_delete,), tags='dangerous', text=_('Delete'),
view='django_gpg:key_delete', args=['object.fingerprint', 'object.type']
)
link_key_query = Link(
permissions=[permission_keyserver_query], text=_('Query keyservers'),
permissions=(permission_keyserver_query,), text=_('Query keyservers'),
view='django_gpg:key_query'
)
link_key_receive = Link(
keep_query=True, permissions=[permission_key_receive], text=_('Import'),
keep_query=True, permissions=(permission_key_receive,), text=_('Import'),
view='django_gpg:key_receive', args='object.key_id'
)
link_key_setup = Link(
icon='fa fa-key', permissions=[permission_key_view],
icon='fa fa-key', permissions=(permission_key_view,),
text=_('Key management'), view='django_gpg:key_public_list'
)

14
mayan/apps/document_comments/apps.py
View File

@@ -45,7 +45,9 @@ class DocumentCommentsApp(MayanAppConfig):
SourceColumn(source=Comment, label=_('Date'), attribute='submit_date')
SourceColumn(
source=Comment, label=_('User'),
attribute=encapsulate(lambda x: x.user.get_full_name() if x.user.get_full_name() else x.user)
attribute=encapsulate(
lambda x: x.user.get_full_name() if x.user.get_full_name() else x.user
)
)
SourceColumn(source=Comment, label=_('Comment'), attribute='comment')
@@ -57,13 +59,13 @@ class DocumentCommentsApp(MayanAppConfig):
)
menu_sidebar.bind_links(
links=[link_comment_add],
sources=[
links=(link_comment_add,),
sources=(
'comments:comments_for_document', 'comments:comment_add',
'comments:comment_delete', 'comments:comment_multiple_delete'
]
)
menu_object.bind_links(links=[link_comment_delete], sources=[Comment])
)
menu_object.bind_links(links=(link_comment_delete,), sources=(Comment,))
menu_facet.bind_links(
links=[link_comments_for_document], sources=[Document]
links=(link_comments_for_document,), sources=(Document,)
)

8
mayan/apps/document_comments/links.py
View File

@@ -10,18 +10,18 @@ from .permissions import (
)
link_comment_add = Link(
permissions=[permission_comment_create], text=_('Add comment'),
permissions=(permission_comment_create,), text=_('Add comment'),
view='comments:comment_add', args='object.pk'
)
link_comment_delete = Link(
permissions=[permission_comment_delete], tags='dangerous',
permissions=(permission_comment_delete,), tags='dangerous',
text=_('Delete'), view='comments:comment_delete', args='object.pk'
)
link_comment_multiple_delete = Link(
permissions=[permission_comment_delete], tags='dangerous',
permissions=(permission_comment_delete,), tags='dangerous',
text=_('Delete'), view='comments:comment_multiple_delete', args='object.pk'
)
link_comments_for_document = Link(
permissions=[permission_comment_view], text=_('Comments'),
permissions=(permission_comment_view,), text=_('Comments'),
view='comments:comments_for_document', args='object.pk'
)

22
mayan/apps/document_indexing/apps.py
View File

@@ -60,30 +60,30 @@ class DocumentIndexingApp(MayanAppConfig):
)
menu_facet.bind_links(
links=[link_document_index_list], sources=[Document]
links=(link_document_index_list,), sources=(Document,)
)
menu_object.bind_links(
links=[
links=(
link_index_setup_edit, link_index_setup_view,
link_index_setup_document_types, link_index_setup_delete
], sources=[Index]
), sources=(Index,)
)
menu_object.bind_links(
links=[
links=(
link_template_node_create, link_template_node_edit,
link_template_node_delete
], sources=[IndexTemplateNode]
), sources=(IndexTemplateNode,)
)
menu_main.bind_links(links=[link_index_main_menu])
menu_main.bind_links(links=(link_index_main_menu,))
menu_secondary.bind_links(
links=[link_index_setup_list, link_index_setup_create],
sources=[
links=(link_index_setup_list, link_index_setup_create),
sources=(
Index, 'indexing:index_setup_list',
'indexing:index_setup_create'
]
)
menu_setup.bind_links(links=[link_index_setup])
menu_tools.bind_links(links=[link_rebuild_index_instances])
)
menu_setup.bind_links(links=(link_index_setup,))
menu_tools.bind_links(links=(link_rebuild_index_instances,))
post_document_created.connect(
document_created_index_update,

35
mayan/apps/document_indexing/links.py
View File

@@ -18,64 +18,67 @@ def is_not_root_node(context):
link_document_index_list = Link(
permissions=[permission_document_view], text=_('Indexes'),
permissions=(permission_document_view,), text=_('Indexes'),
view='indexing:document_index_list', args='object.pk'
)
link_index_list = Link(
permissions=[permission_document_indexing_view], text=_('Index list'),
permissions=(permission_document_indexing_view,), text=_('Index list'),
view='indexing:index_list'
)
link_index_main_menu = Link(
icon='fa fa-list-ul', text=_('Indexes'), view='indexing:index_list'
)
link_index_setup = Link(
icon='fa fa-list-ul', permissions=[permission_document_indexing_setup],
icon='fa fa-list-ul', permissions=(permission_document_indexing_setup,),
text=_('Indexes'), view='indexing:index_setup_list'
)
link_index_setup_list = Link(
permissions=[permission_document_indexing_setup], text=_('Indexes'),
permissions=(permission_document_indexing_setup,), text=_('Indexes'),
view='indexing:index_setup_list'
)
link_index_setup_create = Link(
permissions=[permission_document_indexing_create], text=_('Create index'),
permissions=(permission_document_indexing_create,), text=_('Create index'),
view='indexing:index_setup_create'
)
link_index_setup_edit = Link(
permissions=[permission_document_indexing_edit], text=_('Edit'),
permissions=(permission_document_indexing_edit,), text=_('Edit'),
view='indexing:index_setup_edit', args='resolved_object.pk'
)
link_index_setup_delete = Link(
permissions=[permission_document_indexing_delete], tags='dangerous',
permissions=(permission_document_indexing_delete,), tags='dangerous',
text=_('Delete'), view='indexing:index_setup_delete',
args='resolved_object.pk'
)
link_index_setup_view = Link(
permissions=[permission_document_indexing_setup], text=_('Tree template'),
permissions=(permission_document_indexing_setup,), text=_('Tree template'),
view='indexing:index_setup_view', args='resolved_object.pk'
)
link_index_setup_document_types = Link(
permissions=[permission_document_indexing_edit], text=_('Document types'),
permissions=(permission_document_indexing_edit,), text=_('Document types'),
view='indexing:index_setup_document_types', args='resolved_object.pk'
)
link_rebuild_index_instances = Link(
icon='fa fa-database',
description=_('Deletes and creates from scratch all the document indexes.'),
permissions=[permission_document_indexing_rebuild_indexes],
description=_(
'Deletes and creates from scratch all the document indexes.'
),
permissions=(permission_document_indexing_rebuild_indexes),
text=_('Rebuild indexes'), view='indexing:rebuild_index_instances'
)
link_template_node_create = Link(
permissions=[permission_document_indexing_setup], text=_('New child node'),
view='indexing:template_node_create', args='resolved_object.pk'
permissions=(permission_document_indexing_setup,),
text=_('New child node'), view='indexing:template_node_create',
args='resolved_object.pk'
)
link_template_node_edit = Link(
condition=is_not_root_node,
permissions=[permission_document_indexing_setup], text=_('Edit'),
permissions=(permission_document_indexing_setup,), text=_('Edit'),
view='indexing:template_node_edit', args='resolved_object.pk'
)
link_template_node_delete = Link(
condition=is_not_root_node, permissions=[
condition=is_not_root_node, permissions=(
permission_document_indexing_setup
],
),
tags='dangerous', text=_('Delete'), view='indexing:template_node_delete',
args='resolved_object.pk'
)