diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
| commit | 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch) | |
| tree | 93e57765139714bd82dede475725516c448c0d55 /app/models/custom_field.rb | |
| parent | 34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff) | |
| download | redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip | |
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/custom_field.rb')
| -rw-r--r-- | app/models/custom_field.rb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 75fac2464..c5c8a9373 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -80,7 +80,7 @@ class CustomField < ActiveRecord::Base when 'bool' [[l(:general_text_Yes), '1'], [l(:general_text_No), '0']] else - read_possible_values_utf8_encoded || [] + possible_values || [] end end @@ -91,14 +91,20 @@ class CustomField < ActiveRecord::Base when 'bool' ['1', '0'] else - read_possible_values_utf8_encoded + values = super() + 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 # Makes possible_values accept a multiline string def possible_values=(arg) if arg.is_a?(Array) - write_attribute(:possible_values, arg.compact.collect(&:strip).select {|v| !v.blank?}) + super(arg.compact.collect(&:strip).select {|v| !v.blank?}) else self.possible_values = arg.to_s.split(/[\n\r]+/) end @@ -218,14 +224,4 @@ 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 |