Remove checkbox special case handling, only used in toolshed

galaxyproject · Dec 1, 2017 · d0565f1 · d0565f1
1 parent 0147816
commit d0565f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -4499,11 +4499,7 @@ def get_widgets(self, user, contents={}, **kwd):
                     value = field.get('default', '')
             # Create the field widget
             field_widget = eval(field_type)(field_name)
-            if field_type in ['TextField', 'PasswordField']:
-                field_widget.set_size(40)
-                field_widget.value = value
-            elif field_type == 'TextArea':
-                field_widget.set_size(3, 40)
+            if field_type in ['TextField', 'TextArea', 'PasswordField', 'CheckboxField']:
                 field_widget.value = value
             elif field_type in ['AddressField', 'WorkflowField', 'WorkflowMappingField', 'HistoryField']:
                 field_widget.user = user
@@ -4515,8 +4511,6 @@ def get_widgets(self, user, contents={}, **kwd):
                         field_widget.add_option(option, option, selected=True)
                     else:
                         field_widget.add_option(option, option)
-            elif field_type == 'CheckboxField':
-                field_widget.set_checked(value)
             if field['required'] == 'required':
                 req = 'Required'
             else:

diff --git a/lib/galaxy/web/form_builder.py b/lib/galaxy/web/form_builder.py
@@ -79,19 +79,11 @@ class CheckboxField(BaseField):
     def __init__(self, name, checked=None, refresh_on_change=False, refresh_on_change_values=None, value=None, **kwds):
         super(CheckboxField, self).__init__(name, value, **kwds)
         self.name = name
-        self.checked = (checked is True) or (isinstance(checked, string_types) and (checked.lower() in ("yes", "true", "on")))
 
     @staticmethod
     def is_checked(value):
         if value in [True, "true"]:
             return True
-        return isinstance(value, list) and ('__CHECKED__' in value or len(value) == 2)
-
-    def set_checked(self, value):
-        if isinstance(value, string_types):
-            self.checked = value.lower() in ["yes", "true", "on"]
-        else:
-            self.checked = value
 
     def to_dict(self):
         d = super(CheckboxField, self).to_dict()