details: http://www.bx.psu.edu/hg/galaxy/rev/41a77e993641 changeset: 3289:41a77e993641 user: James Taylor james@jamestaylor.org date: Wed Jan 27 16:58:12 2010 -0500 description: Also do not use default value for repeats when ignore_errors=True

diffstat:

lib/galaxy/tools/parameters/grouping.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r a357369bd0a2 -r 41a77e993641 lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py Wed Jan 27 16:51:24 2010 -0500 +++ b/lib/galaxy/tools/parameters/grouping.py Wed Jan 27 16:58:12 2010 -0500 @@ -69,8 +69,11 @@ rval_dict['__index__'] = d.get( '__index__', i ) # Restore child inputs for input in self.inputs.itervalues(): - if ignore_errors and input.name not in d: #this wasn't tested - rval_dict[ input.name ] = input.get_initial_value( None, d ) + if ignore_errors and input.name not in d: + # If we do not have a value, and are ignoring errors, we simply + # do nothing. There will be no value for the parameter in the + # conditional's values dictionary. + pass else: rval_dict[ input.name ] = input.value_from_basic( d[input.name], app, ignore_errors ) rval.append( rval_dict )