2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/82c3a4ab2b01/ Changeset: 82c3a4ab2b01 Branch: next-stable User: Dave Bouvier Date: 2013-07-31 16:38:40 Summary: Fix server error when displaying a tool with conditionals in the tool shed. Affected #: 2 files diff -r 866d8b29854f4079250efae62a6fddf0204e51c4 -r 82c3a4ab2b0191507cd720c96ada1a66b0b142db lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1514,8 +1514,8 @@ NOTE: This is wasteful since dynamic options and dataset collection happens twice (here and when generating HTML). """ - # Can't look at history in workflow mode - if trans is None or trans.workflow_building_mode: + # Can't look at history in workflow mode. Tool shed has no histories. + if trans is None or trans.workflow_building_mode or trans.webapp.name == 'tool_shed': return DummyDataset() assert trans is not None, "DataToolParameter requires a trans" history = trans.get_history() diff -r 866d8b29854f4079250efae62a6fddf0204e51c4 -r 82c3a4ab2b0191507cd720c96ada1a66b0b142db templates/webapps/tool_shed/repository/tool_form.mako --- a/templates/webapps/tool_shed/repository/tool_form.mako +++ b/templates/webapps/tool_shed/repository/tool_form.mako @@ -70,6 +70,8 @@ <%def name="row_for_param( prefix, param, parent_state, other_values )"><% + # Disable refresh_on_change for select lists displayed in the tool shed. + param.refresh_on_change = False label = param.get_label() if isinstance( param, DataToolParameter ) or isinstance( param, ColumnListParameter ) or isinstance( param, GenomeBuildParameter ): field = SelectField( param.name ) https://bitbucket.org/galaxy/galaxy-central/commits/f2e03734f86b/ Changeset: f2e03734f86b User: Dave Bouvier Date: 2013-07-31 16:40:15 Summary: Merge in bugfix from next-stable. Affected #: 2 files diff -r 6a32d26aefc758cf576e0b753c2626ac56005c18 -r f2e03734f86bc6bec204cee0c9b53aac8b20ba4a lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1514,8 +1514,8 @@ NOTE: This is wasteful since dynamic options and dataset collection happens twice (here and when generating HTML). """ - # Can't look at history in workflow mode - if trans is None or trans.workflow_building_mode: + # Can't look at history in workflow mode. Tool shed has no histories. + if trans is None or trans.workflow_building_mode or trans.webapp.name == 'tool_shed': return DummyDataset() assert trans is not None, "DataToolParameter requires a trans" history = trans.get_history() diff -r 6a32d26aefc758cf576e0b753c2626ac56005c18 -r f2e03734f86bc6bec204cee0c9b53aac8b20ba4a templates/webapps/tool_shed/repository/tool_form.mako --- a/templates/webapps/tool_shed/repository/tool_form.mako +++ b/templates/webapps/tool_shed/repository/tool_form.mako @@ -70,6 +70,8 @@ <%def name="row_for_param( prefix, param, parent_state, other_values )"><% + # Disable refresh_on_change for select lists displayed in the tool shed. + param.refresh_on_change = False label = param.get_label() if isinstance( param, DataToolParameter ) or isinstance( param, ColumnListParameter ) or isinstance( param, GenomeBuildParameter ): field = SelectField( param.name ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.