1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/bdad5064ebc9/ changeset: bdad5064ebc9 user: inithello date: 2012-07-13 20:18:15 summary: Show an error message during tool installation if tool_dependency_dir is unset. affected #: 3 files

diff -r 01c78c55b229e5e872ffb2320a51468a5c7ba7ee -r bdad5064ebc9de3cfcaeb89993eb5e326d82815c lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -1128,7 +1128,11 @@ break else: readme_text = '' - install_tool_dependencies_check_box = CheckboxField( 'install_tool_dependencies', checked=True ) + if trans.app.config.tool_dependency_dir is None: + checked = False + else: + checked = True + install_tool_dependencies_check_box = CheckboxField( 'install_tool_dependencies', checked=checked ) return trans.fill_template( '/admin/tool_shed_repository/select_tool_panel_section.mako', encoded_repo_info_dicts=encoded_repo_info_dicts, includes_tools=includes_tools,

diff -r 01c78c55b229e5e872ffb2320a51468a5c7ba7ee -r bdad5064ebc9de3cfcaeb89993eb5e326d82815c templates/admin/tool_shed_repository/common.mako --- a/templates/admin/tool_shed_repository/common.mako +++ b/templates/admin/tool_shed_repository/common.mako @@ -85,9 +85,14 @@ </div><div class="form-row"><label>Install tool dependencies?</label> - ${install_tool_dependencies_check_box.get_html()} + <% disabled = trans.app.config.tool_dependency_dir is None %> + ${install_tool_dependencies_check_box.get_html( disabled=disabled )} <div class="toolParamHelp" style="clear: both;"> - Un-check to skip automatic installation of these tool dependencies. + %if disabled: + Set the tool_dependency_dir configuration value in your universe_wsgi.ini to automatically install tool dependencies. + %else: + Un-check to skip automatic installation of these tool dependencies. + %endif </div></div><div style="clear: both"></div>

diff -r 01c78c55b229e5e872ffb2320a51468a5c7ba7ee -r bdad5064ebc9de3cfcaeb89993eb5e326d82815c templates/admin/tool_shed_repository/select_tool_panel_section.mako --- a/templates/admin/tool_shed_repository/select_tool_panel_section.mako +++ b/templates/admin/tool_shed_repository/select_tool_panel_section.mako @@ -23,7 +23,7 @@ <br/><div class="toolForm"> - %if includes_tool_dependencies: + %if includes_tool_dependencies and trans.app.config.use_tool_dependencies: <div class="toolFormTitle">Confirm tool dependency installation</div> %else: <div class="toolFormTitle">Choose the tool panel section to contain the installed tools (optional)</div> @@ -31,7 +31,7 @@ <div class="toolFormBody"><form name="select_tool_panel_section" id="select_tool_panel_section" action="${h.url_for( controller='admin_toolshed', action='prepare_for_install', tool_shed_url=tool_shed_url, encoded_repo_info_dicts=encoded_repo_info_dicts, includes_tools=includes_tools, includes_tool_dependencies=includes_tool_dependencies )}" method="post" ><div style="clear: both"></div> - %if includes_tool_dependencies: + %if includes_tool_dependencies and trans.app.config.use_tool_dependencies: ${render_tool_dependency_section( install_tool_dependencies_check_box, repo_info_dicts )} <div style="clear: both"></div><div class="form-row">

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.