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

Use message mako to display purging success message

Browse Source
This commit is contained in:
guerler
2017-10-16 14:45:07 -04:00
parent 34b07b807b
commit 3c5fc3fc42
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+1 -6
View File
@@ -1143,11 +1143,6 @@ class AdminToolshed(AdminGalaxy):
purge_status, purge_message = irm.purge_repository(repository)
if purge_status == 'ok':
new_kwd['status'] = 'done'
return trans.response.send_redirect(web.url_for(controller='admin_toolshed',
action='manage_repository',
message=message,
status=status,
id=repository_id))
else:
new_kwd['status'] = 'error'
new_kwd['message'] = purge_message
@@ -1163,7 +1158,7 @@ class AdminToolshed(AdminGalaxy):
else:
new_kwd['status'] = 'error'
new_kwd['message'] = 'Invalid repository id value "None" received for repository to be purged.'
return trans.show_error_message(new_kwd['message'])
return trans.fill_template('message.mako', **new_kwd)
@web.expose
@web.require_admin
lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
+1 -1
View File
@@ -209,7 +209,7 @@ class InstalledRepositoryGrid(grids.Grid):
url_args=dict(controller='admin_toolshed',
action='restore_repository')),
grids.GridOperation(label="Purge",
condition=(lambda item: item.is_new),
#condition=(lambda item: item.is_new),
allow_multiple=False,
target='center',
url_args=dict(controller='admin_toolshed',