details: http://www.bx.psu.edu/hg/galaxy/rev/f87019342f0a changeset: 3204:f87019342f0a user: Anton Nekrutenko <anton@bx.psu.edu> date: Tue Jan 05 14:36:09 2010 -0500 description: merge diffstat: buildbot_setup.sh | 3 +++ lib/galaxy/web/controllers/workflow.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (32 lines): diff -r b142b116024c -r f87019342f0a buildbot_setup.sh --- a/buildbot_setup.sh Tue Jan 05 14:33:39 2010 -0500 +++ b/buildbot_setup.sh Tue Jan 05 14:36:09 2010 -0500 @@ -14,6 +14,9 @@ LINKS=" /depot/data2/galaxy/alignseq.loc +/depot/data2/galaxy/annotation_profiler/annotation_profiler.loc +/depot/data2/galaxy/annotation_profiler/annotation_profiler_options.xml +/depot/data2/galaxy/annotation_profiler/annotation_profiler_valid_builds.txt /depot/data2/galaxy/binned_scores.loc /depot/data2/galaxy/blastdb.loc /depot/data2/galaxy/bowtie_indices.loc diff -r b142b116024c -r f87019342f0a lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py Tue Jan 05 14:33:39 2010 -0500 +++ b/lib/galaxy/web/controllers/workflow.py Tue Jan 05 14:36:09 2010 -0500 @@ -315,13 +315,14 @@ upgrade_message = module.check_and_update_state() if upgrade_message: data['upgrade_messages'][step.order_index] = upgrade_message - # Pack atrributes into plain dictionary + # Pack attributes into plain dictionary step_dict = { 'id': step.order_index, 'type': module.type, 'tool_id': module.get_tool_id(), 'name': module.get_name(), 'tool_state': module.get_state(), + 'tooltip': module.get_tooltip(), 'tool_errors': module.get_errors(), 'data_inputs': module.get_data_inputs(), 'data_outputs': module.get_data_outputs(),