diff --git a/templates/webapps/galaxy/workflow/display.mako b/templates/webapps/galaxy/workflow/display.mako index 12fd2ce4763..1bd5fac5e50 100644 --- a/templates/webapps/galaxy/workflow/display.mako +++ b/templates/webapps/galaxy/workflow/display.mako @@ -15,12 +15,12 @@ %for input_index, input in enumerate( inputs.values() ): %if input.type == "repeat":
-
${input.title_plural}
+
${input.title_plural}
<% repeat_values = values[input.name] %> %for i in range( len( repeat_values ) ): -
+
<% index = repeat_values[i]['__index__'] %> -
${input.title} ${i + 1}
+
${input.title} ${i + 1}
${do_inputs( input.inputs, repeat_values[ i ], prefix + input.name + "_" + str(index) + "|", step, other_values )}
%endfor @@ -34,9 +34,9 @@ %elif input.type == "section": <% new_prefix = prefix + input.name + "|" %> <% group_values = values[input.name] %> -
${input.title}:
+
${input.title}:
-
+
${do_inputs( input.inputs, group_values, new_prefix, step, other_values )}
@@ -47,7 +47,7 @@ <%def name="row_for_param( param, value, other_values, prefix, step )"> - <% cls = "form-row ml-2" %> + <% cls = "form-row" %>
@@ -92,56 +92,64 @@ # and an error will occur. To prevent this error, make sure user has a history. trans.get_history( most_recent=True, create=True ) %> - %for i, step in enumerate( steps ): - %if step.type == 'tool' or step.type is None: - <% - tool = trans.app.toolbox.get_tool( step.tool_id ) - %> - %if tool: -

Step ${int(step.order_index)+1}: ${tool.name | h}

- %if hasattr( step, "annotation") and step.annotation is not None: -
${step.annotation}
+ %if outer_workflow: + + + %endif + %for i, step in enumerate( steps ): + + + + %endfor + %if outer_workflow: +
StepAnnotation
+ %if step.type == 'tool' or step.type is None: + <% + tool = trans.app.toolbox.get_tool( step.tool_id ) + %> +
+ %if tool: +
Step ${int(step.order_index)+1}: ${tool.name | h}
+
+ ${do_inputs( tool.inputs, step.state.inputs, "", step )} +
+ %else: +
Step ${int(step.order_index)+1}: Unknown Tool with id '${step.tool_id | h}'
+ %endif +
+ %elif step.type == 'subworkflow': +
+
Step ${int(step.order_index)+1}: ${step.label or (step.subworkflow.name if step.subworkflow else "Missing workflow") | h}
+ <% errors = step.module.get_errors() %> + %if errors: +
+ Error in Subworkflow: +
    + %for error in errors: +
  • ${error}
    • + %endfor +
+
+ %else: +
+ ${render_item( step.subworkflow, step.subworkflow.steps, outer_workflow=False )}
+
+ %endif +
+ %else: + ## TODO: always input dataset? + <% module = step.module %> +
+
Step ${int(step.order_index)+1}: ${module.name | h}
+
+ ${do_inputs( module.get_runtime_inputs(), step.state.inputs, "", step )} +
+
%endif -
- ${do_inputs( tool.inputs, step.state.inputs, "", step )} -
- %else: -

Step ${int(step.order_index)+1}: Unknown Tool with id '${step.tool_id | h}'

- %if hasattr( step, "annotation") and step.annotation is not None: -
${step.annotation}
- %endif - %endif - %elif step.type == 'subworkflow': -

Step ${int(step.order_index)+1}: ${step.label or (step.subworkflow.name if step.subworkflow else "Missing workflow") | h}

- %if hasattr( step, "annotation") and step.annotation is not None: -
${step.annotation}
- %endif - <% errors = step.module.get_errors() %> - %if errors: -
- Error in Subworkflow: -
    - %for error in errors: -
  • ${error}
    • - %endfor -
-
- %else: -
- ${render_item( step.subworkflow, step.subworkflow.steps, outer_workflow=False )}
-
- %endif - %else: - ## TODO: always input dataset? - <% module = step.module %> -

Step ${int(step.order_index)+1}: ${module.name | h}

- %if hasattr( step, "annotation") and step.annotation is not None: -
${step.annotation}
- %endif -
- ${do_inputs( module.get_runtime_inputs(), step.state.inputs, "", step )} -
- %endif -
- %endfor + 		+ %if hasattr( step, "annotation") and step.annotation is not None: + ${step.annotation} + %endif +
+ %endif