Remove toolshed form builder

galaxyproject · Dec 6, 2017 · 4fd9635 · 4fd9635
1 parent 63d312c
commit 4fd9635
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 363 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -9,6 +9,7 @@
 from galaxy import util, web
 from galaxy.tools.deps import views
 from galaxy.util import unicodify
+from galaxy.web.form_builder import CheckboxField
 from tool_shed.galaxy_install import (
     dependency_display,
     install_manager
@@ -32,7 +33,6 @@
     tool_util,
     workflow_util
 )
-from tool_shed.util.form_util import CheckboxField
 from tool_shed.util.web_util import escape
 from .admin import AdminGalaxy
 
@@ -239,7 +239,7 @@ def deactivate_or_uninstall_repository(self, trans, **kwd):
                         message += 'Attempting to uninstall tool dependencies resulted in errors: %s' % errors
                         status = max(status, statuses.index('error'))
         status = statuses[status]
-        remove_from_disk_check_box = CheckboxField('remove_from_disk', checked=remove_from_disk_checked)
+        remove_from_disk_check_box = CheckboxField('remove_from_disk', value=remove_from_disk_checked)
         return trans.fill_template('/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako',
                                    repository=tool_shed_repositories,
                                    remove_from_disk_check_box=remove_from_disk_check_box,
@@ -535,10 +535,10 @@ def install_tool_dependencies_with_update(self, trans, **kwd):
         else:
             install_tool_dependencies_check_box_checked = True
         install_tool_dependencies_check_box = CheckboxField('install_tool_dependencies',
-                                                            checked=install_tool_dependencies_check_box_checked)
+                                                            value=install_tool_dependencies_check_box_checked)
         view = views.DependencyResolversView(self.app)
         if view.installable_resolvers:
-            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', checked=True)
+            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', value=True)
         else:
             install_resolver_dependencies_check_box = None
         return trans.fill_template('/admin/tool_shed_repository/install_tool_dependencies_with_update.mako',
@@ -1054,12 +1054,12 @@ def prepare_for_install(self, trans, **kwd):
         else:
             install_tool_dependencies_check_box_checked = True
         install_tool_dependencies_check_box = CheckboxField('install_tool_dependencies',
-                                                            checked=install_tool_dependencies_check_box_checked)
+                                                            value=install_tool_dependencies_check_box_checked)
         # Handle repository dependencies check box.
-        install_repository_dependencies_check_box = CheckboxField('install_repository_dependencies', checked=True)
+        install_repository_dependencies_check_box = CheckboxField('install_repository_dependencies', value=True)
         view = views.DependencyResolversView(self.app)
         if view.installable_resolvers:
-            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', checked=True)
+            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', value=True)
         else:
             install_resolver_dependencies_check_box = None
         encoded_repo_info_dicts = encoding_util.encoding_sep.join(encoded_repo_info_dicts)
@@ -1392,7 +1392,7 @@ def reselect_tool_panel_section(self, trans, **kwd):
             else:
                 original_section_name = ''
             tool_panel_section_select_field = tool_util.build_tool_panel_section_select_field(trans.app)
-            no_changes_check_box = CheckboxField('no_changes', checked=True)
+            no_changes_check_box = CheckboxField('no_changes', value=True)
             if original_section_name:
                 message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>.  " \
                     % (escape(tool_shed_repository.name), original_section_name)
@@ -1423,7 +1423,7 @@ def reselect_tool_panel_section(self, trans, **kwd):
         # whether installed or missing.
         containers_dict = dd.merge_missing_repository_dependencies_to_installed_container(containers_dict)
         # Handle repository dependencies check box.
-        install_repository_dependencies_check_box = CheckboxField('install_repository_dependencies', checked=True)
+        install_repository_dependencies_check_box = CheckboxField('install_repository_dependencies', value=True)
         # Handle tool dependencies check box.
         if trans.app.config.tool_dependency_dir is None:
             if includes_tool_dependencies:
@@ -1433,10 +1433,10 @@ def reselect_tool_panel_section(self, trans, **kwd):
             install_tool_dependencies_check_box_checked = False
         else:
             install_tool_dependencies_check_box_checked = True
-        install_tool_dependencies_check_box = CheckboxField('install_tool_dependencies', checked=install_tool_dependencies_check_box_checked)
+        install_tool_dependencies_check_box = CheckboxField('install_tool_dependencies', value=install_tool_dependencies_check_box_checked)
         view = views.DependencyResolversView(self.app)
         if view.installable_resolvers:
-            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', checked=True)
+            install_resolver_dependencies_check_box = CheckboxField('install_resolver_dependencies', value=True)
         else:
             install_resolver_dependencies_check_box = None
         return trans.fill_template('/admin/tool_shed_repository/reselect_tool_panel_section.mako',