1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/bebad193a6c4/ changeset: bebad193a6c4 user: greg date: 2012-01-19 16:42:39 summary: Fix for searching for workflows in the tool shed. affected #: 2 files diff -r 3b38e670704ff3ce2a3f6b134508a43d008be28c -r bebad193a6c498732beac9ecf31b6407f28724fa lib/galaxy/webapps/community/controllers/admin.py --- a/lib/galaxy/webapps/community/controllers/admin.py +++ b/lib/galaxy/webapps/community/controllers/admin.py @@ -336,9 +336,12 @@ tool_metadata_dict[ 'version' ] ) if 'workflows' in metadata: metadata_str += '<b>Workflows:</b><br/>' - for workflow_metadata_dict in metadata[ 'workflows' ]: - metadata_str += '%s <b>%s</b><br/>' % ( workflow_metadata_dict[ 'name' ], - workflow_metadata_dict[ 'format-version' ] ) + # metadata[ 'workflows' ] is a list of tuples where each contained tuple is + # [ <relative path to the .ga file in the repository>, <exported workflow dict> ] + workflow_tups = metadata[ 'workflows' ] + workflow_metadata_dicts = [ workflow_tup[1] for workflow_tup in workflow_tups ] + for workflow_metadata_dict in workflow_metadata_dicts: + metadata_str += '%s <b>%s</b><br/>' % ( workflow_metadata_dict[ 'name' ], workflow_metadata_dict[ 'format-version' ] ) return metadata_str class MaliciousColumn( grids.BooleanColumn ): def get_value( self, trans, grid, repository_metadata ): diff -r 3b38e670704ff3ce2a3f6b134508a43d008be28c -r bebad193a6c498732beac9ecf31b6407f28724fa lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -620,7 +620,10 @@ ok = False elif workflow_names: if 'workflows' in metadata: - workflows = metadata[ 'workflows' ] + # metadata[ 'workflows' ] is a list of tuples where each contained tuple is + # [ <relative path to the .ga file in the repository>, <exported workflow dict> ] + workflow_tups = metadata[ 'workflows' ] + workflows = [ workflow_tup[1] for workflow_tup in workflow_tups ] else: workflows = [] for workflow_dict in workflows: 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.