3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/636f0270fc30/ Changeset: 636f0270fc30 Branch: next-stable User: jmchilton Date: 2014-05-27 16:06:44 Summary: Bugfix: Don't show deleted HDCAs when displaying tool selection options. Affected #: 2 files diff -r a5f097248869df64d6f16a2e7dc14c3ceffbcce1 -r 636f0270fc3009a4da3737ffd1751d40821d3cdd lib/galaxy/dataset_collections/__init__.py --- a/lib/galaxy/dataset_collections/__init__.py +++ b/lib/galaxy/dataset_collections/__init__.py @@ -170,7 +170,7 @@ return validated_payload def history_dataset_collections(self, history, query): - collections = history.dataset_collections + collections = history.active_dataset_collections collections = filter( query.direct_match, collections ) return collections diff -r a5f097248869df64d6f16a2e7dc14c3ceffbcce1 -r 636f0270fc3009a4da3737ffd1751d40821d3cdd lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1738,7 +1738,7 @@ dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if dataset_collection_matcher.hdca_match( history_dataset_collection, reduction=reduction ): name = history_dataset_collection.name hid = str( history_dataset_collection.hid ) @@ -2042,7 +2042,7 @@ dataset_matcher = DatasetMatcher( trans, self, value, other_values ) dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if not self._history_query( trans ).can_map_over( history_dataset_collection ): continue https://bitbucket.org/galaxy/galaxy-central/commits/2cab30fd7436/ Changeset: 2cab30fd7436 Branch: next-stable User: jmchilton Date: 2014-05-27 16:06:44 Summary: English fix: Spelling error in a5f0972. Affected #: 1 file diff -r 636f0270fc3009a4da3737ffd1751d40821d3cdd -r 2cab30fd7436a0e38bb3d60eea5b5fa929f62244 lib/galaxy/dataset_collections/util.py --- a/lib/galaxy/dataset_collections/util.py +++ b/lib/galaxy/dataset_collections/util.py @@ -10,7 +10,7 @@ ERROR_MESSAGE_NO_NAME = "Cannot load invalid dataset identifier - missing name - %s" ERROR_MESSAGE_NO_COLLECTION_TYPE = "No collection_type define for nested collection %s." ERROR_MESSAGE_INVALID_PARAMETER_FOUND = "Found invalid parameter %s in element identifier description %s." -ERROR_MESSAGE_DUPLICATED_IDENTIFIER_FOUND = "Found duplicated element idenfier name %s." +ERROR_MESSAGE_DUPLICATED_IDENTIFIER_FOUND = "Found duplicated element identifier name %s." def api_payload_to_create_params( payload ): https://bitbucket.org/galaxy/galaxy-central/commits/3f5ed3658cbe/ Changeset: 3f5ed3658cbe User: jmchilton Date: 2014-05-27 16:07:03 Summary: Merge latest next-stable. Affected #: 3 files diff -r 8f1f131bdeb49f876a06d748d97cfb48ec329550 -r 3f5ed3658cbecfcdcfa6f130a0d3a361f98d5508 lib/galaxy/dataset_collections/__init__.py --- a/lib/galaxy/dataset_collections/__init__.py +++ b/lib/galaxy/dataset_collections/__init__.py @@ -170,7 +170,7 @@ return validated_payload def history_dataset_collections(self, history, query): - collections = history.dataset_collections + collections = history.active_dataset_collections collections = filter( query.direct_match, collections ) return collections diff -r 8f1f131bdeb49f876a06d748d97cfb48ec329550 -r 3f5ed3658cbecfcdcfa6f130a0d3a361f98d5508 lib/galaxy/dataset_collections/util.py --- a/lib/galaxy/dataset_collections/util.py +++ b/lib/galaxy/dataset_collections/util.py @@ -10,7 +10,7 @@ ERROR_MESSAGE_NO_NAME = "Cannot load invalid dataset identifier - missing name - %s" ERROR_MESSAGE_NO_COLLECTION_TYPE = "No collection_type define for nested collection %s." ERROR_MESSAGE_INVALID_PARAMETER_FOUND = "Found invalid parameter %s in element identifier description %s." -ERROR_MESSAGE_DUPLICATED_IDENTIFIER_FOUND = "Found duplicated element idenfier name %s." +ERROR_MESSAGE_DUPLICATED_IDENTIFIER_FOUND = "Found duplicated element identifier name %s." def api_payload_to_create_params( payload ): diff -r 8f1f131bdeb49f876a06d748d97cfb48ec329550 -r 3f5ed3658cbecfcdcfa6f130a0d3a361f98d5508 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1738,7 +1738,7 @@ dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if dataset_collection_matcher.hdca_match( history_dataset_collection, reduction=reduction ): name = history_dataset_collection.name hid = str( history_dataset_collection.hid ) @@ -2042,7 +2042,7 @@ dataset_matcher = DatasetMatcher( trans, self, value, other_values ) dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if not self._history_query( trans ).can_map_over( history_dataset_collection ): continue 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.