Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide hidden data parameters in workflow editor #2120

Merged
merged 2 commits into from
Apr 15, 2016
Merged

Hide hidden data parameters in workflow editor #2120

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78add7
Hide hidden data parameters in workflow editor
guerler Apr 6, 2016
c78887c
Use elif, do not require hidden attribute
guerler Apr 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions lib/galaxy/workflow/modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,22 +904,23 @@ def get_data_inputs( self ):
data_inputs = []

def callback( input, prefixed_name, prefixed_label, **kwargs ):
if isinstance( input, DataToolParameter ):
data_inputs.append( dict(
name=prefixed_name,
label=prefixed_label,
multiple=input.multiple,
extensions=input.extensions,
input_type="dataset", ) )
if isinstance( input, DataCollectionToolParameter ):
data_inputs.append( dict(
name=prefixed_name,
label=prefixed_label,
multiple=input.multiple,
input_type="dataset_collection",
collection_types=input.collection_types,
extensions=input.extensions,
) )
if hasattr( input, 'hidden' ) and not input.hidden:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure this is correct, I think this should be:

if not hasattr( input, 'hidden' ) or not input.hidden:

if isinstance( input, DataToolParameter ):
data_inputs.append( dict(
name=prefixed_name,
label=prefixed_label,
multiple=input.multiple,
extensions=input.extensions,
input_type="dataset", ) )
if isinstance( input, DataCollectionToolParameter ):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/if/elif/

just to make it clear.

data_inputs.append( dict(
name=prefixed_name,
label=prefixed_label,
multiple=input.multiple,
input_type="dataset_collection",
collection_types=input.collection_types,
extensions=input.extensions,
) )

visit_input_values( self.tool.inputs, self.state.inputs, callback )
return data_inputs
Expand Down