From 9052c592758e50cdba427cfd96e4fdd03d3c7ccf Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 19 Oct 2017 03:36:15 -0400 Subject: [PATCH] Remove unused api flag from repository installation controller --- .../galaxy/controllers/admin_toolshed.py | 21 +++++++------------ .../initiate_repository_installation.mako | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py index 944a560eda4..1b8933c0e20 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -559,24 +559,17 @@ class AdminToolshed(AdminGalaxy): @web.expose @web.require_admin def install_repositories(self, trans, **kwd): - api_installation = util.asbool(kwd.get('api', 'false')) - if api_installation: - tsr_ids = json.loads(kwd.get('tool_shed_repository_ids', '[]')) - kwd['tool_shed_repository_ids'] = tsr_ids - tsridslist = common_util.get_tool_shed_repository_ids(**kwd) - else: - tsridslist = common_util.get_tool_shed_repository_ids(**kwd) - if not tsridslist: - return self.message_exception(trans, 'Select at least 1 tool shed repository to %s.' % operation) - irm = install_manager.InstallRepositoryManager(trans.app) reinstalling = util.string_as_bool(kwd.get('reinstalling', False)) - encoded_kwd = kwd['encoded_kwd'] + encoded_kwd = kwd.get('encoded_kwd') decoded_kwd = encoding_util.tool_shed_decode(encoded_kwd) install_resolver_dependencies = CheckboxField.is_checked(decoded_kwd.get('install_resolver_dependencies', '')) install_tool_dependencies = CheckboxField.is_checked(decoded_kwd.get('install_tool_dependencies', '')) - tsr_ids = decoded_kwd['tool_shed_repository_ids'] decoded_kwd['install_resolver_dependencies'] = install_resolver_dependencies decoded_kwd['install_tool_dependencies'] = install_tool_dependencies + tsr_ids = decoded_kwd.get('tool_shed_repository_ids') + if not tsr_ids: + return self.message_exception(trans, 'Repository ids missing.') + irm = install_manager.InstallRepositoryManager(trans.app) try: tool_shed_repositories = irm.install_repositories( tsr_ids=tsr_ids, @@ -794,7 +787,9 @@ class AdminToolshed(AdminGalaxy): if not tsridslist: tsridslist = repository_util.get_ids_of_tool_shed_repositories_being_installed(trans.app, as_string=False) kwd['tool_shed_repository_ids'] = tsridslist - return self.repository_installation_grid(trans, **kwd) + + + return trans.fill_template('admin/tool_shed_repository/initiate_repository_installation.mako', tool_shed_repositories=tool_shed_repositories) @web.json @web.require_admin diff --git a/templates/admin/tool_shed_repository/initiate_repository_installation.mako b/templates/admin/tool_shed_repository/initiate_repository_installation.mako index bd36a33b4bc..6b5634a6dea 100644 --- a/templates/admin/tool_shed_repository/initiate_repository_installation.mako +++ b/templates/admin/tool_shed_repository/initiate_repository_installation.mako @@ -15,14 +15,14 @@ }); var initiate_repository_installation = function ( iri_ids, encoded_kwd, reinstalling ) { // Make ajax call - $.ajax( { + iri_ids && $.ajax( { type: "POST", url: "${h.url_for( controller='admin_toolshed', action='install_repositories' )}", dataType: "html", data: { tool_shed_repository_ids: iri_ids, encoded_kwd: encoded_kwd, reinstalling: reinstalling }, success : function ( data ) { console.log( "Initializing repository installation succeeded" ); - }, + } }); };