2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/74e5b4de14e4/ Changeset: 74e5b4de14e4 User: jgoecks Date: 2013-10-07 18:36:34 Summary: Add close button to Trackster. Affected #: 1 file diff -r 16e3de8d3f13e700ae1cc02d0e9146b8ea351155 -r 74e5b4de14e4db132d196de1d18eaaca6e82a59e static/scripts/viz/trackster_ui.js --- a/static/scripts/viz/trackster_ui.js +++ b/static/scripts/viz/trackster_ui.js @@ -108,7 +108,14 @@ buttons : { "Cancel": function() { Galaxy.modal.hide() } } }); }); - } } + } }, + { + icon_class: 'cross-circle', + title: 'Close', + on_click: function() { + window.location = galaxy_config.root + 'visualization'; + } + } ], { tooltip_config: { placement: 'bottom' } https://bitbucket.org/galaxy/galaxy-central/commits/3679add0809c/ Changeset: 3679add0809c User: jgoecks Date: 2013-10-07 22:17:45 Summary: Automated merge Affected #: 3 files diff -r 74e5b4de14e4db132d196de1d18eaaca6e82a59e -r 3679add0809c669e752c913ade2fc8e45adcff46 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -148,7 +148,8 @@ """Method called from Galaxy to generate the current list of tool dependency ids for an installed tool shed repository.""" tool_dependencies_select_field = SelectField( name=name, multiple=multiple, display=display ) for tool_dependency in tool_shed_repository.tool_dependencies: - if uninstalled and tool_dependency.status != trans.model.ToolDependency.installation_status.UNINSTALLED: + if uninstalled and tool_dependency.status not in [ trans.model.ToolDependency.installation_status.NEVER_INSTALLED, + trans.model.ToolDependency.installation_status.UNINSTALLED ]: continue option_label = '%s version %s' % ( str( tool_dependency.name ), str( tool_dependency.version ) ) option_value = trans.security.encode_id( tool_dependency.id ) diff -r 74e5b4de14e4db132d196de1d18eaaca6e82a59e -r 3679add0809c669e752c913ade2fc8e45adcff46 templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako --- a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako +++ b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako @@ -35,7 +35,8 @@ else: error_message = '' if not can_install: - if tool_dependency.status in [ trans.model.ToolDependency.installation_status.UNINSTALLED ]: + if tool_dependency.status in [ trans.model.ToolDependency.installation_status.NEVER_INSTALLED, + trans.model.ToolDependency.installation_status.UNINSTALLED ]: can_install = True if not can_uninstall: if tool_dependency.status not in [ trans.model.ToolDependency.installation_status.UNINSTALLED ]: diff -r 74e5b4de14e4db132d196de1d18eaaca6e82a59e -r 3679add0809c669e752c913ade2fc8e45adcff46 test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -275,6 +275,7 @@ def extract_log_data( test_result, from_tool_test=True ): '''Extract any useful data from the test_result.failures and test_result.errors attributes.''' + log_data = [] for failure in test_result.failures + test_result.errors: # Record the twill test identifier and information about the tool, so the repository owner can discover which test is failing. test_id = str( failure[0] ) @@ -314,7 +315,8 @@ for output_type in [ 'stderr', 'traceback' ]: if output_type in tmp_output: test_status[ output_type ] = '\n'.join( tmp_output[ output_type ] ) - return test_status + log_data.append( test_status ) + return log_data def get_api_url( base, parts=[], params=None, key=None ): if 'api' in parts and parts.index( 'api' ) != 0: 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.