3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/da270e660db5/ changeset: da270e660db5 user: natefoo date: 2012-12-18 21:41:10 summary: Backed out changeset 0d6653d29222, this needs to go to -dist so it will be committed on the current dist parent and then merged back to -central. affected #: 1 file diff -r 0d6653d29222880e3ade27bd055569ccebc7234e -r da270e660db5594d14205ac7a2dfd8f3b0fcc649 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 @@ -1511,7 +1511,6 @@ @web.expose @web.require_admin def reselect_tool_panel_section( self, trans, **kwd ): - message = '' repository_id = kwd[ 'id' ] tool_shed_repository = suc.get_installed_tool_shed_repository( trans, repository_id ) metadata = tool_shed_repository.metadata @@ -1552,14 +1551,14 @@ tool_panel_section_select_field = build_tool_panel_section_select_field( trans ) no_changes_check_box = CheckboxField( 'no_changes', checked=True ) if original_section_name: - message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ + message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ % ( tool_shed_repository.name, original_section_name ) message += "Uncheck the <b>No changes</b> check box and select a different tool panel section to load the tools in a " - message += "different section in the tool panel. " + message += "different section in the tool panel." status = 'warning' else: - message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_repository.name - message += "Uncheck the <b>No changes</b> check box and select a tool panel section to load the tools into that section. " + message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_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 = 'warning' if metadata and 'readme_files' in metadata: url = suc.url_join( tool_shed_url, @@ -1583,9 +1582,9 @@ install_repository_dependencies_check_box = CheckboxField( 'install_repository_dependencies', checked=True ) # Handle tool dependencies check box. if trans.app.config.tool_dependency_dir is None: - if tool_shed_repository.includes_tool_dependencies: - message += "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " - message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository. " + if includes_tool_dependencies: + message = "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " + message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository." status = "warning" install_tool_dependencies_check_box_checked = False else: https://bitbucket.org/galaxy/galaxy-central/changeset/cda19f585a15/ changeset: cda19f585a15 user: natefoo date: 2012-12-18 21:41:41 summary: From Dave B.: Fix for reinstalling repository with tool dependencies when tool_dependency_dir is not set. affected #: 1 file diff -r 140b1d164818a3ecba581b9e313a1b846f120164 -r cda19f585a15241a1ee91a795a995a8f1dcca188 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 @@ -1511,6 +1511,7 @@ @web.expose @web.require_admin def reselect_tool_panel_section( self, trans, **kwd ): + message = '' repository_id = kwd[ 'id' ] tool_shed_repository = suc.get_installed_tool_shed_repository( trans, repository_id ) metadata = tool_shed_repository.metadata @@ -1551,14 +1552,14 @@ tool_panel_section_select_field = build_tool_panel_section_select_field( trans ) no_changes_check_box = CheckboxField( 'no_changes', checked=True ) if original_section_name: - message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ + message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ % ( tool_shed_repository.name, original_section_name ) message += "Uncheck the <b>No changes</b> check box and select a different tool panel section to load the tools in a " - message += "different section in the tool panel." + message += "different section in the tool panel. " status = 'warning' else: - message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_repository.name - message += "Uncheck the <b>No changes</b> check box and select a tool panel section to load the tools into that section." + message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_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 = 'warning' if metadata and 'readme_files' in metadata: url = suc.url_join( tool_shed_url, @@ -1582,9 +1583,9 @@ install_repository_dependencies_check_box = CheckboxField( 'install_repository_dependencies', checked=True ) # Handle tool dependencies check box. if trans.app.config.tool_dependency_dir is None: - if includes_tool_dependencies: - message = "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " - message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository." + if tool_shed_repository.includes_tool_dependencies: + message += "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " + message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository. " status = "warning" install_tool_dependencies_check_box_checked = False else: https://bitbucket.org/galaxy/galaxy-central/changeset/de8bc5bde938/ changeset: de8bc5bde938 user: natefoo date: 2012-12-18 21:42:24 summary: Merged changes from galaxy-dist-staging. affected #: 1 file diff -r da270e660db5594d14205ac7a2dfd8f3b0fcc649 -r de8bc5bde938c937759ced066ef28ce1f6202641 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 @@ -1511,6 +1511,7 @@ @web.expose @web.require_admin def reselect_tool_panel_section( self, trans, **kwd ): + message = '' repository_id = kwd[ 'id' ] tool_shed_repository = suc.get_installed_tool_shed_repository( trans, repository_id ) metadata = tool_shed_repository.metadata @@ -1551,14 +1552,14 @@ tool_panel_section_select_field = build_tool_panel_section_select_field( trans ) no_changes_check_box = CheckboxField( 'no_changes', checked=True ) if original_section_name: - message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ + message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel section <b>%s</b>. " \ % ( tool_shed_repository.name, original_section_name ) message += "Uncheck the <b>No changes</b> check box and select a different tool panel section to load the tools in a " - message += "different section in the tool panel." + message += "different section in the tool panel. " status = 'warning' else: - message = "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_repository.name - message += "Uncheck the <b>No changes</b> check box and select a tool panel section to load the tools into that section." + message += "The tools contained in your <b>%s</b> repository were last loaded into the tool panel outside of any sections. " % tool_shed_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 = 'warning' if metadata and 'readme_files' in metadata: url = suc.url_join( tool_shed_url, @@ -1582,9 +1583,9 @@ install_repository_dependencies_check_box = CheckboxField( 'install_repository_dependencies', checked=True ) # Handle tool dependencies check box. if trans.app.config.tool_dependency_dir is None: - if includes_tool_dependencies: - message = "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " - message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository." + if tool_shed_repository.includes_tool_dependencies: + message += "Tool dependencies defined in this repository can be automatically installed if you set the value of your <b>tool_dependency_dir</b> " + message += "setting in your Galaxy config file (universe_wsgi.ini) and restart your Galaxy server before installing the repository. " status = "warning" install_tool_dependencies_check_box_checked = False else: 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.