commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/61f42ba042e6/ Changeset: 61f42ba042e6 Branch: next-stable User: guerler Date: 2014-11-19 16:51:53+00:00 Summary: Fix drill down filter if context is missing Affected #: 1 file diff -r bc3f37e266b062a23a38f016bd2f520549c826cf -r 61f42ba042e6eefb830ebc3203cd98a57f47f690 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1446,7 +1446,7 @@ else: options = [] for filter_key, filter_value in self.filtered.iteritems(): - dataset = other_values[filter_key] + dataset = other_values.get(filter_key) if dataset.__class__.__name__.endswith( "DatasetFilenameWrapper" ): # this is a bad way to check for this, but problems importing class ( due to circular imports? ) dataset = dataset.dataset if dataset: https://bitbucket.org/galaxy/galaxy-central/commits/ba2808ad2c77/ Changeset: ba2808ad2c77 User: guerler Date: 2014-11-19 16:52:21+00:00 Summary: Merge Affected #: 1 file diff -r c6cc1b48564682ac96ef7c5915c6f4982d8184fc -r ba2808ad2c779d3b09013aaf56a752fa9993cdfc lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1446,7 +1446,7 @@ else: options = [] for filter_key, filter_value in self.filtered.iteritems(): - dataset = other_values[filter_key] + dataset = other_values.get(filter_key) if dataset.__class__.__name__.endswith( "DatasetFilenameWrapper" ): # this is a bad way to check for this, but problems importing class ( due to circular imports? ) dataset = dataset.dataset if dataset: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org