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 remote-tracking branch 'vavrusa/table-datatype' into dev.

Browse Source 
Conflicts:
	lib/galaxy/datatypes/tabular.py
This commit is contained in:
John Chilton
2015-06-03 10:52:42 -04:00
parent f0b4f1c81e bc8bdadca8
commit 884e824d72
7 changed files with 288 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/scatterplot/config/scatterplot.xml
+1
View File
@@ -5,6 +5,7 @@
<data_source>
<model_class>HistoryDatasetAssociation</model_class>
<test type="isinstance" test_attr="datatype" result_type="datatype">tabular.Tabular</test>
<test type="isinstance" test_attr="datatype" result_type="datatype">tabular.CSV</test>
<to_param param_attr="id">dataset_id</to_param>
</data_source>
</data_sources>