1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8c28c1898af8/ changeset: 8c28c1898af8 user: greg date: 2012-07-11 23:32:27 summary: Fixes for installing / reinstalling tool shed repositories. affected #: 2 files
diff -r 7aac5800197b4ad9fc8d76350b744d5e795e31cc -r 8c28c1898af85d8be0fb3b524518ce9916d14cac lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -608,6 +608,7 @@ tool_section = None for tup in zip( tool_shed_repositories, repo_info_dicts ): tool_shed_repository, repo_info_dict = tup + repo_info_dict = tool_shed_decode( repo_info_dict ) # Clone each repository to the configured location. update_tool_shed_repository_status( trans.app, tool_shed_repository, trans.model.ToolShedRepository.installation_status.CLONING ) repo_info_tuple = repo_info_dict[ tool_shed_repository.name ] @@ -1048,7 +1049,7 @@ owner=owner, dist_to_shed=False ) created_or_updated_tool_shed_repositories.append( tool_shed_repository ) - filtered_repo_info_dicts.append( repo_info_dict ) + filtered_repo_info_dicts.append( tool_shed_encode( repo_info_dict ) ) if created_or_updated_tool_shed_repositories: if includes_tools and ( new_tool_panel_section or tool_panel_section ): if new_tool_panel_section: @@ -1226,6 +1227,7 @@ tool_shed_repository.dist_to_shed ) ctx_rev = get_ctx_rev( tool_shed_url, tool_shed_repository.name, tool_shed_repository.owner, tool_shed_repository.installed_changeset_revision ) repo_info_dict = kwd.get( 'repo_info_dict', None ) + # The repo_info_dict should be encoded. if not repo_info_dict: # This should only happen if the tool_shed_repository does not include any valid tools. repo_info_dict = create_repo_info_dict( tool_shed_repository, @@ -1234,6 +1236,7 @@ tool_shed_repository.installed_changeset_revision, ctx_rev, metadata ) + repo_info_dict = tool_shed_encode( repo_info_dict ) new_kwd = dict( includes_tool_dependencies=tool_shed_repository.includes_tool_dependencies, includes_tools=tool_shed_repository.includes_tools, install_tool_dependencies=install_tool_dependencies, @@ -1341,6 +1344,7 @@ message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % repository.name message += "Uncheck the <b>No changes</b> check box and select a tool panel section to load the tools into that section." status = 'done' + includes_tool_dependencies = 'tool_dependencies' in metadata install_tool_dependencies_check_box = CheckboxField( 'install_tool_dependencies', checked=True ) return trans.fill_template( '/admin/tool_shed_repository/reselect_tool_panel_section.mako', repository=repository, @@ -1348,7 +1352,8 @@ original_section_name=original_section_name, install_tool_dependencies_check_box=install_tool_dependencies_check_box, tool_panel_section_select_field=tool_panel_section_select_field, - repo_info_dict=tool_shed_encode( repo_info_dict ), + encoded_repo_info_dict=tool_shed_encode( repo_info_dict ), + repo_info_dict=repo_info_dict, includes_tool_dependencies=includes_tool_dependencies, message=message, status=status )
diff -r 7aac5800197b4ad9fc8d76350b744d5e795e31cc -r 8c28c1898af85d8be0fb3b524518ce9916d14cac templates/admin/tool_shed_repository/reselect_tool_panel_section.mako --- a/templates/admin/tool_shed_repository/reselect_tool_panel_section.mako +++ b/templates/admin/tool_shed_repository/reselect_tool_panel_section.mako @@ -9,7 +9,7 @@ <div class="toolForm"><div class="toolFormTitle">Choose the tool panel section to contain the installed tools (optional)</div><div class="toolFormBody"> - <form name="reselect_tool_panel_section" id="reselect_tool_panel_section" action="${h.url_for( controller='admin_toolshed', action='reinstall_repository', id=trans.security.encode_id( repository.id ), repo_info_dict=repo_info_dict )}" method="post" > + <form name="reselect_tool_panel_section" id="reselect_tool_panel_section" action="${h.url_for( controller='admin_toolshed', action='reinstall_repository', id=trans.security.encode_id( repository.id ), repo_info_dict=encoded_repo_info_dict )}" method="post" ><div style="clear: both"></div> %if includes_tool_dependencies: ${render_tool_dependency_section( install_tool_dependencies_check_box, [ repo_info_dict ] )}
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.