opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename mako to emphasize new role, add message handler

Browse Source
This commit is contained in:
guerler
2017-10-19 06:12:18 -04:00
parent b218aae1de
commit 77f6b7bacb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+3 -3
View File
@@ -794,7 +794,7 @@ class AdminToolshed(AdminGalaxy):
for tsr_id in tsr_ids:
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/initiate_repository_installation.mako',
return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
tool_shed_repositories=tool_shed_repositories,
query=query)
@@ -946,7 +946,7 @@ class AdminToolshed(AdminGalaxy):
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/initiate_repository_installation.mako',
return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
encoded_kwd=encoded_kwd,
query=query,
tool_shed_repositories=tool_shed_repositories,
@@ -1262,7 +1262,7 @@ 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/initiate_repository_installation.mako',
return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
encoded_kwd=encoded_kwd,
query=query,
tool_shed_repositories=tool_shed_repositories,
templates/admin/tool_shed_repository/initiate_repository_installation.mako → templates/admin/tool_shed_repository/monitor_repository_installation.mako
+6 -1
View File
@@ -1,4 +1,5 @@
<%inherit file="/base.mako"/>
<%namespace file="/message.mako" import="render_msg" />
<%namespace file="/admin/tool_shed_repository/common.mako" import="*" />
<%def name="javascripts()">
@@ -10,7 +11,7 @@
<%def name="repository_installation_javascripts()">
<script type="text/javascript">
%if context.get(initiate_repository_installation_ids):
%if hasattr(self, "initiate_repository_installation_ids"):
$(document).ready(function( ){
initiate_repository_installation( "${initiate_repository_installation_ids}", "${encoded_kwd}", "${reinstalling}" );
});
@@ -30,6 +31,10 @@
</script>
</%def>
%if hasattr(self, "message"):
${render_msg( message, error )}
%endif
%if tool_shed_repositories:
<div class="toolForm">
<div class="toolFormTitle">Monitor installing tool shed repositories</div>