This commit is contained in:
guerler
2017-10-19 15:18:52 -04:00
parent 50ecbea171
commit b76e0559dd
2 changed files with 4 additions and 7 deletions
@@ -795,10 +795,10 @@ class AdminToolshed(AdminGalaxy):
clause_list.append(trans.install_model.ToolShedRepository.table.c.id == tsr_id)
query = trans.install_model.context.current.query(trans.install_model.ToolShedRepository).filter(or_(*clause_list))
return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
tool_shed_repositories=tool_shed_repositories,
query=query,
message=escape(kwd.get('message')),
status=kwd.get('status'))
tool_shed_repositories=tool_shed_repositories,
query=query,
message=escape(kwd.get('message')),
status=kwd.get('status'))
@web.json
@web.require_admin
@@ -945,7 +945,6 @@ class AdminToolshed(AdminGalaxy):
tool_panel_section_keys=tool_panel_section_keys,
tool_path=tool_path,
tool_shed_url=tool_shed_url)
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
install_repository_manager.initiate_repository_installation(installation_dict)
return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
@@ -1,7 +1,5 @@
import logging
from sqlalchemy import false, or_
from galaxy import util
from galaxy.model import tool_shed_install
from galaxy.web import url_for