commit/galaxy-central: greg: More fixes for managing tool dependencies for installed tool shed repositories.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/cd7fe5ef5328/ Changeset: cd7fe5ef5328 User: greg Date: 2013-07-19 20:14:59 Summary: More fixes for managing tool dependencies for installed tool shed repositories. Affected #: 1 file diff -r 2c257f0cbeb8a09e9b04a67ae59bf68a46e650e9 -r cd7fe5ef532822f778dda054ec434aec6ce17eee lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -731,9 +731,15 @@ message = kwd.get( 'message', '' ) status = kwd.get( 'status', 'done' ) tool_dependency_ids = tool_dependency_util.get_tool_dependency_ids( as_string=False, **kwd ) - # We need a tool_shed_repository, so get it from one of the tool_dependencies. - tool_dependency = tool_dependency_util.get_tool_dependency( trans, tool_dependency_ids[ 0 ] ) - tool_shed_repository = tool_dependency.tool_shed_repository + repository_id = kwd.get( 'repository_id', None ) + if tool_dependency_ids: + # We need a tool_shed_repository, so get it from one of the tool_dependencies. + tool_dependency = tool_dependency_util.get_tool_dependency( trans, tool_dependency_ids[ 0 ] ) + tool_shed_repository = tool_dependency.tool_shed_repository + else: + # The user must be on the manage_repository_tool_dependencies page and clicked the button to either install or uninstall a + # tool dependency, but they didn't check any of the available tool dependencies on which to perform the action. + tool_shed_repository = suc.get_tool_shed_repository_by_id( trans, repository_id ) self.tool_dependency_grid.title = "Tool shed repository '%s' tool dependencies" % tool_shed_repository.name if 'operation' in kwd: operation = kwd[ 'operation' ].lower() @@ -773,6 +779,7 @@ return trans.response.send_redirect( web.url_for( controller='admin_toolshed', action='manage_repository_tool_dependencies', tool_dependency_ids=tool_dependency_ids, + repository_id=repository_id, message=message, status=status ) ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org