Merge branch 'master' into dev

This commit is contained in:
Dannon Baker
2015-09-25 13:41:10 -04:00
+2
View File
@@ -1538,6 +1538,8 @@ class Tool( object, Dictifiable ):
group_errors[-1] = { '__index__': 'Cannot add repeat (max size=%i).' % input.max }
any_group_errors = True
rep_index += 1
if any_group_errors:
errors[ input.name ] = group_errors
elif isinstance( input, Conditional ):
group_state = state[input.name]
group_prefix = "%s|" % ( key )