Changeset 1461:6bbf70be8b03

Show
Ignore:
Timestamp:
07/31/08 20:49:06 (5 months ago)
Author:
James Taylor <james@jamestaylor.org>
branch:
default
Message:

Compensatory bug in conditional parameters that was revealed by previous
commit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • templates/tool_form.tmpl

    r1316 r1461  
    5858      #set group_errors = $errors.get( $input.name, {} ) 
    5959      #set current_case = $group_state['__current_case__'] 
    60       #set prefix = $prefix + $input.name + "|" 
    61       $row_for_param( $prefix, $input.test_param, $group_state, $group_errors, $context ) 
    62       $do_inputs( $input.cases[$current_case].inputs, $group_state, $group_errors, $prefix, $context ) 
     60      #set group_prefix = $prefix + $input.name + "|" 
     61      $row_for_param( $group_prefix, $input.test_param, $group_state, $group_errors, $context ) 
     62      $do_inputs( $input.cases[$current_case].inputs, $group_state, $group_errors, $group_prefix, $context ) 
    6363    #else 
    6464      $row_for_param( $prefix, $input, $tool_state, $errors, $context ) 
  • templates/workflow/editor_tool_form.mako

    r1288 r1461  
    2424      <% group_values = values[input.name] %> 
    2525      <% current_case = group_values['__current_case__'] %> 
    26       <% prefix = prefix + input.name + "|" %> 
     26      <% group_prefix = prefix + input.name + "|" %> 
    2727      <% group_errors = errors.get( input.name, {} ) %> 
    28       ${row_for_param( input.test_param, group_values[ input.test_param.name ], group_errors, prefix )} 
    29       ${do_inputs( input.cases[ current_case ].inputs, group_values, group_errors, prefix )} 
     28      ${row_for_param( input.test_param, group_values[ input.test_param.name ], group_errors, group_prefix )} 
     29      ${do_inputs( input.cases[ current_case ].inputs, group_values, group_errors, group_prefix )} 
    3030    %else: 
    3131      ${row_for_param( input, values[ input.name ], errors, prefix )}