3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/304d6d2712ed/ Changeset: 304d6d2712ed User: dan Date: 2013-05-24 19:36:17 Summary: Fix for displaying unicode characters in select menus in form_builder. Affected #: 1 file diff -r 975f94138a55ef728f394c014c02ee54ef4079b1 -r 304d6d2712ed20e68eb54a10a9ff9e6c98adaf85 lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -351,11 +351,17 @@ if selected: selected_text = " selected" last_selected_value = value + if not isinstance( last_selected_value, basestring ): + last_selected_value = str( last_selected_value ) else: selected_text = "" - rval.append( '<option value="%s"%s>%s</option>' % ( escape( str( value ), quote=True ), selected_text, escape( str( text ), quote=True ) ) ) + if not isinstance( value, basestring ): + value = str( value ) + if not isinstance( text, basestring ): + text = str( text ) + rval.append( '<option value="%s"%s>%s</option>' % ( escape( unicodify( value ), quote=True ), selected_text, escape( unicodify( text ), quote=True ) ) ) if last_selected_value: - last_selected_value = ' last_selected_value="%s"' % escape( str( last_selected_value ), quote=True ) + last_selected_value = ' last_selected_value="%s"' % escape( unicodify( last_selected_value ), quote=True ) rval.insert( 0, '<select name="%s%s"%s%s%s%s%s>' % \ ( prefix, self.name, multiple, size, self.refresh_on_change_text, last_selected_value, self.get_disabled_str( disabled ) ) ) rval.append( '</select>' ) https://bitbucket.org/galaxy/galaxy-central/commits/733ce3f5d61f/ Changeset: 733ce3f5d61f Branch: next-stable User: dan Date: 2013-05-24 19:36:17 Summary: Fix for displaying unicode characters in select menus in form_builder. Affected #: 1 file diff -r ec277b165b13131d02998c3cbab3b3e664141a58 -r 733ce3f5d61fc82aedcbee6955dbdb4a41d6ca90 lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -351,11 +351,17 @@ if selected: selected_text = " selected" last_selected_value = value + if not isinstance( last_selected_value, basestring ): + last_selected_value = str( last_selected_value ) else: selected_text = "" - rval.append( '<option value="%s"%s>%s</option>' % ( escape( str( value ), quote=True ), selected_text, escape( str( text ), quote=True ) ) ) + if not isinstance( value, basestring ): + value = str( value ) + if not isinstance( text, basestring ): + text = str( text ) + rval.append( '<option value="%s"%s>%s</option>' % ( escape( unicodify( value ), quote=True ), selected_text, escape( unicodify( text ), quote=True ) ) ) if last_selected_value: - last_selected_value = ' last_selected_value="%s"' % escape( str( last_selected_value ), quote=True ) + last_selected_value = ' last_selected_value="%s"' % escape( unicodify( last_selected_value ), quote=True ) rval.insert( 0, '<select name="%s%s"%s%s%s%s%s>' % \ ( prefix, self.name, multiple, size, self.refresh_on_change_text, last_selected_value, self.get_disabled_str( disabled ) ) ) rval.append( '</select>' ) https://bitbucket.org/galaxy/galaxy-central/commits/60761f32895f/ Changeset: 60761f32895f User: dan Date: 2013-05-24 19:36:44 Summary: merge Affected #: 0 files 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.