Remove secondary initial value handling from basic parameters

galaxyproject · Jan 24, 2017 · e1f87f1 · e1f87f1
1 parent 46fb84a
commit e1f87f1
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
@@ -885,7 +885,7 @@ def get_initial_value( self, trans, other_values ):
             else:
                 value = None
         elif len( value ) == 1:
-            value = value[0]
+            value = value[ 0 ]
         return value
 
     def value_to_display_text( self, value, app ):
@@ -920,15 +920,7 @@ def to_dict( self, trans, other_values={} ):
         # Get options, value.
         options = self.get_options( trans, other_values )
         d[ 'options' ] = options
-        value = None
-        if options:
-            if not self.optional:
-                value = options[ 0 ][ 1 ]
-            for option in options:
-                if option[ 2 ]:
-                    # Found selected option.
-                    value = option[ 1 ]
-        d[ 'value' ] = value
+        d[ 'value' ] = self.get_initial_value( trans, other_values )
         d[ 'display' ] = self.display
         d[ 'multiple' ] = self.multiple
         return d