Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_validation

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",

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:

templates/webapps/galaxy/workflow/run.mako

@@ -361,7 +361,7 @@ if wf_parms:
       <span class="conditional-start"></span>
       ${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