opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for incorrect variable name reuse ('roles'), occurring when importing multiple datasets from a history into a library.

Browse Source
This commit is contained in:
Daniel Blankenberg
2011-06-07 09:04:55 -04:00
parent 439cb5aa35
commit f618b49852
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/library_common.py
+2 -2
View File
@@ -1221,7 +1221,7 @@ class LibraryCommon( BaseController, UsesFormDefinitions ):
# it exists, then we need to apply the LIBRARY_MANAGE permission to the library dataset.
dataset_manage_permissions_action = trans.app.security_agent.get_action( 'DATASET_MANAGE_PERMISSIONS' ).action
flush_needed = False
for action, roles in dataset_permissions_dict.items():
for action, dataset_permissions_roles in dataset_permissions_dict.items():
if isinstance( action, Action ):
action = action.action
if action == dataset_manage_permissions_action:
@@ -1229,7 +1229,7 @@ class LibraryCommon( BaseController, UsesFormDefinitions ):
action = trans.app.security_agent.get_action( 'LIBRARY_MANAGE' ).action
# Allow the permissions inherited from the folder to over-ride the same permissions on the dataset.
if action not in current_library_dataset_actions:
for ldp in [ trans.model.LibraryDatasetPermissions( action, ldda.library_dataset, role ) for role in roles ]:
for ldp in [ trans.model.LibraryDatasetPermissions( action, ldda.library_dataset, role ) for role in dataset_permissions_roles ]:
trans.sa_session.add( ldp )
flush_needed = True
if flush_needed: