diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py index 6a053e0038c..a671e87b6c3 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1336,21 +1336,6 @@ class AdminToolshed(AdminGalaxy): message=message, status=status) - @web.expose - @web.require_admin - def reset_metadata_on_selected_installed_repositories(self, trans, **kwd): - irmm = InstalledRepositoryMetadataManager(trans.app) - if 'reset_metadata_on_selected_repositories_button' in kwd: - message, status = irmm.reset_metadata_on_selected_repositories(trans.user, **kwd) - else: - message = escape(kwd.get('message', '')) - status = kwd.get('status', 'done') - repositories_select_field = irmm.build_repository_ids_select_field() - return trans.fill_template('/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako', - repositories_select_field=repositories_select_field, - message=message, - status=status) - @web.expose @web.require_admin def reset_repository_metadata(self, trans, id): diff --git a/lib/tool_shed/test/base/twilltestcase.py b/lib/tool_shed/test/base/twilltestcase.py index 0efbb56326c..700b27e827b 100644 --- a/lib/tool_shed/test/base/twilltestcase.py +++ b/lib/tool_shed/test/base/twilltestcase.py @@ -1587,9 +1587,9 @@ class ShedTwillTestCase(FunctionalTestCase): self.submit_form(form_no=1, button="reset_metadata_on_selected_repositories_button", **kwd) def reset_metadata_on_selected_installed_repositories(self, repository_ids): - self.visit_galaxy_url('/admin_toolshed/reset_metadata_on_selected_installed_repositories') - kwd = dict(repository_ids=repository_ids) - self.submit_form(form_no=1, button="reset_metadata_on_selected_repositories_button", **kwd) + api_key = get_master_api_key() + response = requests.post(self.galaxy_url + "/api/tool_shed_repositories/reset_metadata_on_selected_installed_repositories", data={'repository_ids': repository_ids, 'key': api_key}) + assert response.status_code != 403, response.content def reset_repository_metadata(self, repository): params = { diff --git a/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako b/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako deleted file mode 100644 index 98d0878aa2c..00000000000 --- a/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako +++ /dev/null @@ -1,40 +0,0 @@ -<%inherit file="/base.mako"/> -<%namespace file="/message.mako" import="render_msg" /> -<%namespace file="/webapps/tool_shed/common/common.mako" import="*" /> - -<%def name="javascripts()"> - ${parent.javascripts()} - ${common_misc_javascripts()} -%def> - -%if message: - ${render_msg( message, status )} -%endif - -