1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/3de162c29e7e/ Changeset: 3de162c29e7e User: greg Date: 2013-09-27 21:44:08 Summary: Eliminate pass-through form data from the request when selecting a tool config or tool panel to contain tools included in tool shed repositories being installed into Galaxy. Affected #: 3 files

diff -r 0d9bba36e6d81eac1c78806d11666b40dd2951ba -r 3de162c29e7e48c0532eab9950244a249f2fddfc 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 @@ -771,7 +771,7 @@ message = kwd.get( 'message', '' ) status = kwd.get( 'status', 'done' ) shed_tool_conf = kwd.get( 'shed_tool_conf', None ) - tool_shed_url = kwd[ 'tool_shed_url' ] + tool_shed_url = kwd.get( 'tool_shed_url', None ) # Handle repository dependencies, which do not include those that are required only for compiling a dependent repository's tool dependencies. has_repository_dependencies = util.string_as_bool( kwd.get( 'has_repository_dependencies', False ) ) install_repository_dependencies = kwd.get( 'install_repository_dependencies', '' ) @@ -785,7 +785,9 @@ includes_tools_for_display_in_tool_panel = util.string_as_bool( kwd.get( 'includes_tools_for_display_in_tool_panel', False ) ) includes_tool_dependencies = util.string_as_bool( kwd.get( 'includes_tool_dependencies', False ) ) install_tool_dependencies = kwd.get( 'install_tool_dependencies', '' ) - encoded_repo_info_dicts = util.listify( kwd.get( 'encoded_repo_info_dicts', None ) ) + encoded_repo_info_dicts = kwd.get( 'encoded_repo_info_dicts', '' ) + if encoded_repo_info_dicts: + encoded_repo_info_dicts = encoded_repo_info_dicts.split( encoding_util.encoding_sep ) if not encoded_repo_info_dicts: # The request originated in the tool shed via a tool search. repository_ids = kwd.get( 'repository_ids', None ) @@ -941,6 +943,8 @@ install_tool_dependencies_check_box = CheckboxField( 'install_tool_dependencies', checked=install_tool_dependencies_check_box_checked ) # Handle repository dependencies check box. install_repository_dependencies_check_box = CheckboxField( 'install_repository_dependencies', checked=True ) + encoded_repo_info_dicts = encoding_util.encoding_sep.join( encoded_repo_info_dicts ) + tool_shed_url = kwd[ 'tool_shed_url' ] if includes_tools_for_display_in_tool_panel: return trans.fill_template( '/admin/tool_shed_repository/select_tool_panel_section.mako', encoded_repo_info_dicts=encoded_repo_info_dicts, @@ -955,7 +959,7 @@ shed_tool_conf=shed_tool_conf, shed_tool_conf_select_field=shed_tool_conf_select_field, tool_panel_section_select_field=tool_panel_section_select_field, - tool_shed_url=kwd[ 'tool_shed_url' ], + tool_shed_url=tool_shed_url, message=message, status=status ) else: @@ -974,7 +978,7 @@ shed_tool_conf=shed_tool_conf, shed_tool_conf_select_field=shed_tool_conf_select_field, tool_panel_section_select_field=tool_panel_section_select_field, - tool_shed_url=kwd[ 'tool_shed_url' ], + tool_shed_url=tool_shed_url, message=message, status=status )

diff -r 0d9bba36e6d81eac1c78806d11666b40dd2951ba -r 3de162c29e7e48c0532eab9950244a249f2fddfc templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako --- a/templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako +++ b/templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako @@ -60,7 +60,14 @@ </div><div class="toolForm"><div class="toolFormBody"> - <form name="select_shed_tool_panel_config" id="select_shed_tool_panel_config" 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_tools_for_display_in_tool_panel=includes_tools_for_display_in_tool_panel, includes_tool_dependencies=includes_tool_dependencies )}" method="post" > + <form name="select_shed_tool_panel_config" id="select_shed_tool_panel_config" action="${h.url_for( controller='admin_toolshed', action='prepare_for_install' )}" method="post" > + <div class="form-row"> + <input type="hidden" name="encoded_repo_info_dicts" value="${encoded_repo_info_dicts}" /> + <input type="hidden" name="includes_tools" value="${includes_tools}" /> + <input type="hidden" name="includes_tool_dependencies" value="${includes_tool_dependencies}" /> + <input type="hidden" name="includes_tools_for_display_in_tool_panel" value="${includes_tools_for_display_in_tool_panel}" /> + <input type="hidden" name="tool_shed_url" value="${tool_shed_url}" /> + </div><div style="clear: both"></div><% readme_files_dict = containers_dict.get( 'readme_files', None ) %> %if readme_files_dict:

diff -r 0d9bba36e6d81eac1c78806d11666b40dd2951ba -r 3de162c29e7e48c0532eab9950244a249f2fddfc 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 @@ -60,7 +60,14 @@ </div><div class="toolForm"><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_tools_for_display_in_tool_panel=includes_tools_for_display_in_tool_panel, includes_tool_dependencies=includes_tool_dependencies )}" method="post" > + <form name="select_tool_panel_section" id="select_tool_panel_section" action="${h.url_for( controller='admin_toolshed', action='prepare_for_install' )}" method="post" > + <div class="form-row"> + <input type="hidden" name="includes_tools" value="${includes_tools}" /> + <input type="hidden" name="includes_tool_dependencies" value="${includes_tool_dependencies}" /> + <input type="hidden" name="includes_tools_for_display_in_tool_panel" value="${includes_tools_for_display_in_tool_panel}" /> + <input type="hidden" name="tool_shed_url" value="${tool_shed_url}" /> + <input type="hidden" name="encoded_repo_info_dicts" value="${encoded_repo_info_dicts}" /> + </div><div style="clear: both"></div><% readme_files_dict = containers_dict.get( 'readme_files', None ) %> %if readme_files_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.