Skip to content

Commit

Permalink
Remove redirects for repository revision installation
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Oct 16, 2017
1 parent 8f2db7f commit 3f5b3f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
10 changes: 2 additions & 8 deletions lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,15 +475,9 @@ def install_latest_repository_revision(self, trans, **kwd):
url = util.build_url(tool_shed_url, pathspec=pathspec, params=params)
return trans.response.send_redirect(url)
else:
message = 'Cannot locate installed tool shed repository with encoded id <b>%s</b>.' % str(repository_id)
status = 'error'
return trans.show_error_message('Cannot locate installed tool shed repository with encoded id <b>%s</b>.' % str(repository_id))
else:
message = 'The request parameters did not include the required encoded <b>id</b> of installed repository.'
status = 'error'
return trans.response.send_redirect(web.url_for(controller='admin',
action='repositories',
message=message,
status=status))
return trans.show_error_message('The request parameters did not include the required encoded <b>id</b> of installed repository.')

@web.expose
@web.require_admin
Expand Down
1 change: 1 addition & 0 deletions lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ def get_accepted_filters(self):
grids.GridOperation(label="Install latest revision",
condition=(lambda item: item.upgrade_available),
allow_multiple=False,
target="center",
url_args=dict(controller='admin_toolshed',
action='install_latest_repository_revision')),
grids.GridOperation(label="Install",
Expand Down

0 comments on commit 3f5b3f1

Please sign in to comment.