kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Force encoding of custom field possible values (#10593). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9330 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-06 07:39:50 +00:00
parent f1cae4f7af
commit bac7dff5bb
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/custom_field.rb
View File

@ -80,7 +80,7 @@ class CustomField < ActiveRecord::Base
when 'bool'
[[l(:general_text_Yes), '1'], [l(:general_text_No), '0']]
else
read_attribute(:possible_values) || []
read_possible_values_utf8_encoded || []
end
end
@ -91,7 +91,7 @@ class CustomField < ActiveRecord::Base
when 'bool'
['1', '0']
else
read_attribute :possible_values
read_possible_values_utf8_encoded
end
end
@ -218,4 +218,14 @@ class CustomField < ActiveRecord::Base
end
errs
end
def read_possible_values_utf8_encoded
values = read_attribute(:possible_values)
if values.is_a?(Array)
values.each do |value|
value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
end
end
values
end
end