opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6039 from jmchilton/fix_1801_merge

Browse Source 
[18.05] Fix merge from 18.01.
This commit is contained in:
Dannon
2018-05-02 11:53:33 -04:00
committed by GitHub
parent e62fd46644 b67ecd4209
commit cacbcdf675
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+3 -2
View File
@@ -1683,7 +1683,8 @@ class DataToolParameter(BaseDataToolParameter):
else:
rval = trans.sa_session.query(trans.app.model.HistoryDatasetAssociation).get(value)
values = util.listify(rval)
dataset_matcher = DatasetMatcher(trans, self, None, other_values)
dataset_matcher_factory = get_dataset_matcher_factory(trans)
dataset_matcher = dataset_matcher_factory.dataset_matcher(self, other_values)
for v in values:
if v:
if v.deleted:
@@ -1691,7 +1692,7 @@ class DataToolParameter(BaseDataToolParameter):
elif hasattr(v, "dataset") and v.dataset.state in [galaxy.model.Dataset.states.ERROR, galaxy.model.Dataset.states.DISCARDED]:
raise ValueError("The previously selected dataset has entered an unusable state")
elif hasattr(v, "dataset"):
match = dataset_matcher.hda_match(v, check_security=False)
match = dataset_matcher.hda_match(v)
if match and match.implicit_conversion:
v.implicit_conversion = True
if not self.multiple: