commit/galaxy-central: dan: Fixes for Implicit Datatype conversion and external display applications.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/4c7437d5583c/ changeset: 4c7437d5583c branches: user: dan date: 2011-06-03 16:16:20 summary: Fixes for Implicit Datatype conversion and external display applications. affected #: 2 files (167 bytes) --- a/lib/galaxy/datatypes/display_applications/parameters.py Thu Jun 02 17:36:38 2011 -0400 +++ b/lib/galaxy/datatypes/display_applications/parameters.py Fri Jun 03 10:16:20 2011 -0400 @@ -92,6 +92,8 @@ #find target ext target_ext, converted_dataset = data.find_conversion_destination( self.formats, converter_safe = True ) if target_ext and not converted_dataset: + if isinstance( data, DisplayDataValueWrapper ): + data = data.value assoc = trans.app.model.ImplicitlyConvertedDatasetAssociation( parent = data, file_type = target_ext, metadata_safe = False ) new_data = data.datatype.convert_dataset( trans, data, target_ext, return_output = True, visible = False ).values()[0] new_data.hid = data.hid --- a/lib/galaxy/model/__init__.py Thu Jun 02 17:36:38 2011 -0400 +++ b/lib/galaxy/model/__init__.py Fri Jun 03 10:16:20 2011 -0400 @@ -1353,7 +1353,7 @@ elif isinstance(parent, LibraryDatasetDatasetAssociation): self.parent_ldda = parent else: - raise AttributeError + raise AttributeError, 'Unknown dataset type provided for parent: %s' % type( parent ) self.type = file_type self.deleted = deleted self.purged = purged 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)
-
Bitbucket