From acee89dc300fb1dc825e89d021fbf58f03168c4a Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 10 Apr 2015 20:45:07 -0400 Subject: [PATCH 1/3] Disable tool sections in workflow editor --- templates/webapps/galaxy/workflow/editor_tool_form.mako | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/webapps/galaxy/workflow/editor_tool_form.mako b/templates/webapps/galaxy/workflow/editor_tool_form.mako index ce039bd145c..e4d4f03127e 100644 --- a/templates/webapps/galaxy/workflow/editor_tool_form.mako +++ b/templates/webapps/galaxy/workflow/editor_tool_form.mako @@ -63,7 +63,7 @@ <% group_errors = errors.get( input.name, {} ) %> ${row_for_param( input.test_param, group_values[ input.test_param.name ], group_errors, group_prefix, ctx, allow_runtime=False )} ${do_inputs( input.cases[ current_case ].inputs, group_values, group_errors, group_prefix, ctx )} - %else: + %elif input.type != "section": %if input.name in values: ${row_for_param( input, values[ input.name ], errors, prefix, ctx )} %else: From 2ca2b936b8ddb93dd6149415ec526d77ca3c90bd Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 10 Apr 2015 20:50:19 -0400 Subject: [PATCH 2/3] Disable tool sections in workflow run form --- templates/webapps/galaxy/workflow/run.mako | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/webapps/galaxy/workflow/run.mako b/templates/webapps/galaxy/workflow/run.mako index dfcdd9ec189..8d780be2f94 100644 --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -361,7 +361,7 @@ if wf_parms: ${row_for_param( input.test_param, group_values[ input.test_param.name ], other_values, group_errors, prefix, step, already_used )} ${do_inputs( input.cases[ current_case ].inputs, group_values, group_errors, new_prefix, step, other_values, already_used )} - %else: + %elif input.type != "section": ${row_for_param( input, values[ input.name ], other_values, errors, prefix, step, already_used )} %endif %endfor From 0357ac5032416869973bdf5a083cf865c6f2ba82 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Fri, 10 Apr 2015 21:26:19 -0400 Subject: [PATCH 3/3] flake8 travis fix E127 continuation line over-indented for visual indent --- lib/galaxy/webapps/galaxy/api/job_files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/job_files.py b/lib/galaxy/webapps/galaxy/api/job_files.py index 4b21c1ceb5b..a8d18f36cb1 100644 --- a/lib/galaxy/webapps/galaxy/api/job_files.py +++ b/lib/galaxy/webapps/galaxy/api/job_files.py @@ -90,8 +90,8 @@ class JobFilesAPIController( BaseAPIController ): " nginx_upload_module but Galaxy is not" " configured to recognize it" ) assert file_path.startswith( upload_store ), \ - ( "Filename provided by nginx (%s) is not in correct" - " directory (%s)" % ( file_path, upload_store ) ) + ( "Filename provided by nginx (%s) is not in correct" + " directory (%s)" % ( file_path, upload_store ) ) input_file = open( file_path ) else: input_file = payload.get( "file",