Fixes #possible_values_options when given an object with nil project.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes #possible_values_options when given an object with nil project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81
8fae4e2e · Jean-Philippe Lang · Eric Davis · d8fbdca7 · 8fae4e2e · 8fae4e2e
Commit 8fae4e2e authored Apr 01, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

custom_field.rb app/models/custom_field.rb +1 -1

custom_field_user_format_test.rb test/unit/custom_field_user_format_test.rb +5 -0

No files found.
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -51,7 +51,7 @@ class CustomField < ActiveRecord::Base
  def possible_values_options(obj=nil)
    case field_format
    when 'user', 'version'
-      if obj.respond_to?(:project)
+      if obj.respond_to?(:project) && obj.project
        case field_format
        when 'user'
          obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}

--- a/test/unit/custom_field_user_format_test.rb
+++ b/test/unit/custom_field_user_format_test.rb
@@ -36,6 +36,11 @@ class CustomFieldUserFormatTest < ActiveSupport::TestCase
    assert_equal project.users.sort.collect(&:id).map(&:to_s), possible_values
  end
  
+  def test_possible_values_with_nil_project_resource
+    project = Project.find(1)
+    assert_equal [], @field.possible_values(Issue.new)
+  end
+  
  def test_possible_values_options_with_no_arguments
    assert_equal [], @field.possible_values_options
    assert_equal [], @field.possible_values_options(nil)