1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/13f8c99da1cd/ Changeset: 13f8c99da1cd User: greg Date: 2013-12-04 16:29:59 Summary: Final fixes for rendering installation errors in the tool test results container in the tool shed. Affected #: 2 files diff -r 8d62ee337534d00d8a3d74150d3ed71d5a1f9b40 -r 13f8c99da1cd462841b268b5beaf2148086bd19d lib/tool_shed/util/container_util.py --- a/lib/tool_shed/util/container_util.py +++ b/lib/tool_shed/util/container_util.py @@ -1199,6 +1199,7 @@ key='current_repository_installation_errors', label='This repository', parent=installation_error_base_folder ) + installation_error_base_folder.folders.append( current_repository_folder ) for current_repository_error_dict in current_repository_installation_error_dicts: repository_installation_error_id += 1 repository_installation_error = \ @@ -1209,13 +1210,13 @@ changeset_revision=str( current_repository_error_dict.get( 'changeset_revision', '' ) ), error_message=current_repository_error_dict.get( 'error_message', '' ) ) current_repository_folder.current_repository_installation_errors.append( repository_installation_error ) - installation_error_base_folder.folders.append( current_repository_folder ) if len( repository_dependency_installation_error_dicts ) > 0: folder_id += 1 repository_dependencies_folder = Folder( id=folder_id, key='repository_dependency_installation_errors', label='Repository dependencies', parent=installation_error_base_folder ) + installation_error_base_folder.folders.append( repository_dependencies_folder ) for repository_dependency_error_dict in repository_dependency_installation_error_dicts: repository_installation_error_id += 1 repository_installation_error = \ @@ -1226,7 +1227,6 @@ changeset_revision=str( repository_dependency_error_dict.get( 'changeset_revision', '' ) ), error_message=repository_dependency_error_dict.get( 'error_message', '' ) ) repository_dependencies_folder.repository_installation_errors.append( repository_installation_error ) - installation_error_base_folder.folders.append( repository_dependencies_folder ) if len( tool_dependency_installation_error_dicts ) > 0: # [{'error_message': 'some traceback string' 'type': 'package', 'name': 'MIRA', 'version': '4.0'}] folder_id += 1 @@ -1234,6 +1234,7 @@ key='tool_dependency_installation_errors', label='Tool dependencies', parent=installation_error_base_folder ) + installation_error_base_folder.folders.append( tool_dependencies_folder ) tool_dependency_error_id = 0 for tool_dependency_error_dict in tool_dependency_installation_error_dicts: tool_dependency_error_id += 1 @@ -1244,7 +1245,6 @@ version=str( tool_dependency_error_dict.get( 'version', '' ) ), error_message=tool_dependency_error_dict.get( 'error_message', '' ) ) tool_dependencies_folder.tool_dependency_installation_errors.append( tool_dependency_installation_error ) - installation_error_base_folder.folders.append( tool_dependencies_folder ) else: tool_test_results_root_folder = None return folder_id, tool_test_results_root_folder diff -r 8d62ee337534d00d8a3d74150d3ed71d5a1f9b40 -r 13f8c99da1cd462841b268b5beaf2148086bd19d templates/webapps/tool_shed/repository/common.mako --- a/templates/webapps/tool_shed/repository/common.mako +++ b/templates/webapps/tool_shed/repository/common.mako @@ -688,14 +688,13 @@ from galaxy.util import unicodify encoded_id = trans.security.encode_id( installation_error.id ) %> - ${render_table_wrap_style( "td_install_error_table" )} <tr class="datasetRow" %if parent is not None: parent="${parent}" %endif id="libraryItem-rtdie-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="td_install_error_table"> + <table id="test_environment"><tr bgcolor="#FFFFCC"><th>Type</th><th>Name</th><th>Version</th></tr> @@ -720,14 +719,13 @@ from galaxy.util import unicodify encoded_id = trans.security.encode_id( installation_error.id ) %> - ${render_table_wrap_style( "rd_install_error_table" )} <tr class="datasetRow" %if parent is not None: parent="${parent}" %endif id="libraryItem-rrie-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="rd_install_error_table"> + <table id="test_environment"> %if not is_current_repository: <tr bgcolor="#FFFFCC"><th>Tool shed</th><th>Name</th><th>Owner</th><th>Changeset revision</th> 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.