opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge in stable branch.

Browse Source
This commit is contained in:
Jeremy Goecks
2013-04-12 16:16:17 -04:00
parent 505684068b de1a836a73
commit f442f2116d
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/visualization/genome/visual_analytics.py
+1 -1
View File
@@ -76,5 +76,5 @@ def get_tool_def( trans, hda ):
# If tool has parameters that can be interactively modified, return tool.
if len( tool_params ) != 0:
return { 'name' : tool.name, 'params' : tool_params }
return { 'id': tool.id, 'name' : tool.name, 'params' : tool_params }
return None
lib/galaxy/webapps/galaxy/api/tools.py
+6 -5
View File
@@ -223,11 +223,12 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ):
for jida in original_job.input_datasets:
input_dataset = jida.dataset
data_provider = data_provider_registry.get_data_provider( trans, original_dataset=input_dataset, source='data' )
if data_provider:
if not data_provider.converted_dataset:
msg = self.convert_dataset( trans, input_dataset, data_source )
if msg is not None:
messages_list.append( msg )
if data_provider and not data_provider.converted_dataset:
# Can convert but no converted dataset yet, so return message about why.
_, data_sources = input_dataset.datatype.get_track_type()
msg = input_dataset.convert_dataset( trans, data_sources[ 'data' ] )
if msg is not None:
messages_list.append( msg )
# Return any messages generated during conversions.
return_message = self._get_highest_priority_msg( messages_list )
static/scripts/packed/viz/trackster/tracks.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/viz/trackster/tracks.js
+4 -2
View File
@@ -1578,6 +1578,7 @@ var Tool = function(track, tool_dict, tool_state_dict) {
// Unpack tool information from dictionary.
//
this.track = track;
this.id = tool_dict.id;
this.name = tool_dict.name;
this.params = [];
var params_dict = tool_dict.params;
@@ -1712,7 +1713,8 @@ extend(Tool.prototype, {
// URL params.
{
target_dataset_id: this.track.original_dataset_id,
tool_id: tool.name
action: 'rerun',
tool_id: tool.id
},
null,
// Success callback.
@@ -1741,7 +1743,7 @@ extend(Tool.prototype, {
{
target_dataset_id: this.track.original_dataset_id,
action: 'rerun',
tool_id: this.name,
tool_id: this.id,
regions: [
region.toJSON()
]