From 318376f6debb256deca071385545445e436e4b65 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 4 Mar 2015 01:13:41 -0500 Subject: [PATCH] Fix errors in galaxy form; usage of 'area' for fields where it doesn't apply, and a missing 'name' parameter to HistoryField new method. --- lib/galaxy/forms/forms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/forms/forms.py b/lib/galaxy/forms/forms.py index 84cc465c0e8..59fb3b2b9de 100644 --- a/lib/galaxy/forms/forms.py +++ b/lib/galaxy/forms/forms.py @@ -218,7 +218,7 @@ class FormDefinitionWorkflowFieldFactory( FormDefinitionFieldFactory ): Return FormDefinition field created from an xml element. """ rval = super( FormDefinitionWorkflowFieldFactory, self ).from_elem( elem, layout=layout ) - rval['type'] = self.__get_stored_field_type( area ) + rval['type'] = self.__get_stored_field_type() return rval @@ -244,7 +244,7 @@ class FormDefinitionWorkflowMappingFieldFactory( FormDefinitionFieldFactory ): Return FormDefinition field created from an xml element. """ rval = super( FormDefinitionWorkflowMappingFieldFactory, self ).from_elem( elem, layout=layout ) - rval['type'] = self.__get_stored_field_type( area ) + rval['type'] = self.__get_stored_field_type() return rval @@ -254,7 +254,7 @@ class FormDefinitionHistoryFieldFactory( FormDefinitionFieldFactory ): def __get_stored_field_type( self ): return 'HistoryField' - def new( self, label=None, required=False, helptext=None, default=None, visible=True, layout=None ): + def new( self, name=None, label=None, required=False, helptext=None, default=None, visible=True, layout=None ): """ Return new FormDefinition field. """ @@ -270,7 +270,7 @@ class FormDefinitionHistoryFieldFactory( FormDefinitionFieldFactory ): Return FormDefinition field created from an xml element. """ rval = super( FormDefinitionHistoryFieldFactory, self ).from_elem( elem, layout=layout ) - rval['type'] = self.__get_stored_field_type( area ) + rval['type'] = self.__get_stored_field_type() return rval