From 861740bd6080bf0ab280594d24460143cbee1033 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Sat, 25 Jun 2016 10:54:51 -0400 Subject: [PATCH] Fix dataset matcher when no tool available. Broken with 80ac816af94d43d7214671582db127483baea2d3. --- lib/galaxy/tools/parameters/dataset_matcher.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tools/parameters/dataset_matcher.py b/lib/galaxy/tools/parameters/dataset_matcher.py index c919864eff0..a04dc67dfab 100644 --- a/lib/galaxy/tools/parameters/dataset_matcher.py +++ b/lib/galaxy/tools/parameters/dataset_matcher.py @@ -35,7 +35,12 @@ class DatasetMatcher( object ): accessible to user. """ dataset = hda.dataset - state_valid = dataset.state in self.tool.valid_input_states + has_tool = self.tool + if has_tool: + valid_input_states = self.tool.valid_input_states + else: + valid_input_states = galaxy.model.Dataset.valid_input_states + state_valid = dataset.state in valid_input_states return state_valid and ( not check_security or self.__can_access_dataset( dataset ) ) def valid_hda_match( self, hda, check_implicit_conversions=True, check_security=False ):