Merged r7772 from trunk (#8615).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7773 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2011-11-11 12:33:15 +00:00
parent d6bf26ace7
commit b6f0d9da8a
2 changed files with 77 additions and 1 deletions
+1 -1
View File
@@ -64,7 +64,7 @@ class CustomField < ActiveRecord::Base
when 'user'
obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}
when 'version'
obj.project.versions.sort.collect {|u| [u.to_s, u.id.to_s]}
obj.project.shared_versions.sort.collect {|u| [u.to_s, u.id.to_s]}
end
elsif obj.is_a?(Array)
obj.collect {|o| possible_values_options(o)}.inject {|memo, v| memo & v}