3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e9613543d7e0/ Changeset: e9613543d7e0 User: dan Date: 2013-05-24 19:43:25 Summary: Fix for displaying unicode characters in select checkboxes in form_builder. Affected #: 1 file diff -r 60761f32895fa480de3f5c9267c4be01992979d0 -r e9613543d7e07b9f3695b284d80a78d032b0bf3a lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -300,7 +300,12 @@ rval.append ( '<div class="checkUncheckAllPlaceholder" checkbox_name="%s%s"></div>' % ( prefix, self.name ) ) #placeholder for the insertion of the Select All/Unselect All buttons for text, value, selected in self.options: style = "" - escaped_value = escape( str( value ), quote=True ) + if not isinstance( value, basestring ): + value = str( value ) + if not isinstance( text, basestring ): + text = str( text ) + text = unicodify( text ) + escaped_value = escape( unicodify( value ), quote=True ) uniq_id = "%s%s|%s" % (prefix, self.name, escaped_value) if len(self.options) > 2 and ctr % 2 == 1: style = " class=\"odd_row\"" @@ -308,7 +313,7 @@ if selected: selected_text = " checked='checked'" rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s" id="%s"%s%s><label class="inline" for="%s">%s</label></div>' % \ - ( style, prefix, self.name, escaped_value, uniq_id, selected_text, self.get_disabled_str( disabled ), uniq_id, escape( str( text ), quote=True ) ) ) + ( style, prefix, self.name, escaped_value, uniq_id, selected_text, self.get_disabled_str( disabled ), uniq_id, escape( text, quote=True ) ) ) ctr += 1 return unicodify( "\n".join( rval ) ) def get_html_radio( self, prefix="", disabled=False ): https://bitbucket.org/galaxy/galaxy-central/commits/9c138ae94a5e/ Changeset: 9c138ae94a5e Branch: next-stable User: dan Date: 2013-05-24 19:43:25 Summary: Fix for displaying unicode characters in select checkboxes in form_builder. Affected #: 1 file diff -r 733ce3f5d61fc82aedcbee6955dbdb4a41d6ca90 -r 9c138ae94a5ee5b7f58d2ce9ff6a2222744b4b31 lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py +++ b/lib/galaxy/web/form_builder.py @@ -300,7 +300,12 @@ rval.append ( '<div class="checkUncheckAllPlaceholder" checkbox_name="%s%s"></div>' % ( prefix, self.name ) ) #placeholder for the insertion of the Select All/Unselect All buttons for text, value, selected in self.options: style = "" - escaped_value = escape( str( value ), quote=True ) + if not isinstance( value, basestring ): + value = str( value ) + if not isinstance( text, basestring ): + text = str( text ) + text = unicodify( text ) + escaped_value = escape( unicodify( value ), quote=True ) uniq_id = "%s%s|%s" % (prefix, self.name, escaped_value) if len(self.options) > 2 and ctr % 2 == 1: style = " class=\"odd_row\"" @@ -308,7 +313,7 @@ if selected: selected_text = " checked='checked'" rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s" id="%s"%s%s><label class="inline" for="%s">%s</label></div>' % \ - ( style, prefix, self.name, escaped_value, uniq_id, selected_text, self.get_disabled_str( disabled ), uniq_id, escape( str( text ), quote=True ) ) ) + ( style, prefix, self.name, escaped_value, uniq_id, selected_text, self.get_disabled_str( disabled ), uniq_id, escape( text, quote=True ) ) ) ctr += 1 return unicodify( "\n".join( rval ) ) def get_html_radio( self, prefix="", disabled=False ): https://bitbucket.org/galaxy/galaxy-central/commits/ca744d4ef4ab/ Changeset: ca744d4ef4ab User: dan Date: 2013-05-24 19:43:58 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.