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

Merge pull request #1217 from ericenns/collection-tool-input-fixes

Browse Source 
Collection tool input mapping performance fixes
This commit is contained in:
John Chilton
2015-12-03 15:31:10 -05:00
parent a570956612 362a25e6e6
commit 92a7b995b0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/actions/__init__.py
+11 -1
View File
@@ -114,9 +114,19 @@ class DefaultToolAction( object ):
elif isinstance( input, DataCollectionToolParameter ):
if not value:
return
for i, v in enumerate( value.collection.dataset_instances ):
dataset_instances = []
if hasattr( value, 'child_collection' ):
# if we are mapping a collection over a tool, we only require the child_collection
dataset_instances = value.child_collection.dataset_instances
else:
# else the tool takes a collection as input so we need everything
dataset_instances = value.collection.dataset_instances
for i, v in enumerate( dataset_instances ):
data = v
current_user_roles = trans.get_current_user_roles()
if not trans.app.security_agent.can_access_dataset( current_user_roles, data.dataset ):
raise Exception( "User does not have permission to use a dataset (%s) provided for input." % data.id )
# Skipping implicit conversion stuff for now, revisit at