2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/52aa19ce6dec/ Changeset: 52aa19ce6dec Branch: stable User: carlfeberhard Date: 2013-11-08 16:32:36 Summary: Tools API, show: re-add html field wrapped in try/except Affected #: 1 file diff -r 151b7d3b2f1b8cf4ba6050214693eee776410574 -r 52aa19ce6decd36397914705de7ca9160f1e6d91 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -174,8 +174,12 @@ def to_dict( self, trans, view='collection', value_mapper=None ): """ to_dict tool parameter. This can be overridden by subclasses. """ tool_dict = super( ToolParameter, self ).to_dict() - #TODO: removing html as it causes a lot of errors on subclasses - needs histories, etc. - #tool_dict[ 'html' ] = urllib.quote( self.get_html( trans ) ) + #TODO: wrapping html as it causes a lot of errors on subclasses - needs histories, etc. + try: + tool_dict[ 'html' ] = urllib.quote( self.get_html( trans ) ) + except AssertionError, e: + pass #HACK for assert trans.history, 'requires a history' + tool_dict[ 'model_class' ] = self.__class__.__name__ if hasattr( self, 'value' ): tool_dict[ 'value' ] = self.value https://bitbucket.org/galaxy/galaxy-central/commits/347a0c84cc24/ Changeset: 347a0c84cc24 User: carlfeberhard Date: 2013-11-08 16:33:14 Summary: Merge stable Affected #: 1 file diff -r b9e7d751cfb5a263d778786efa4e4b4e965b3992 -r 347a0c84cc241bcbdd8f84aae428fc431ee6ece4 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -174,8 +174,12 @@ def to_dict( self, trans, view='collection', value_mapper=None ): """ to_dict tool parameter. This can be overridden by subclasses. """ tool_dict = super( ToolParameter, self ).to_dict() - #TODO: removing html as it causes a lot of errors on subclasses - needs histories, etc. - #tool_dict[ 'html' ] = urllib.quote( self.get_html( trans ) ) + #TODO: wrapping html as it causes a lot of errors on subclasses - needs histories, etc. + try: + tool_dict[ 'html' ] = urllib.quote( self.get_html( trans ) ) + except AssertionError, e: + pass #HACK for assert trans.history, 'requires a history' + tool_dict[ 'model_class' ] = self.__class__.__name__ if hasattr( self, 'value' ): tool_dict[ 'value' ] = self.value 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.