From d00372c8ca260ad1250a8cfcaf6b65f113c349c0 Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Fri, 3 Jun 2011 10:16:20 -0400 Subject: [PATCH] Fixes for Implicit Datatype conversion and external display applications. --- lib/galaxy/datatypes/display_applications/parameters.py | 2 ++ lib/galaxy/model/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/datatypes/display_applications/parameters.py b/lib/galaxy/datatypes/display_applications/parameters.py index cd8a2f5d0c0..a22af845bcf 100644 --- a/lib/galaxy/datatypes/display_applications/parameters.py +++ b/lib/galaxy/datatypes/display_applications/parameters.py @@ -92,6 +92,8 @@ class DisplayApplicationDataParameter( DisplayApplicationParameter ): #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 diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 98448694c65..eb5b89219a3 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1353,7 +1353,7 @@ class ImplicitlyConvertedDatasetAssociation( object ): 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