| @@ -51,7 +51,7 class CustomField < ActiveRecord::Base | |||||
| 51 | def possible_values_options(obj=nil) |
|
51 | def possible_values_options(obj=nil) | |
| 52 | case field_format |
|
52 | case field_format | |
| 53 | when 'user', 'version' |
|
53 | when 'user', 'version' | |
| 54 | if obj.respond_to?(:project) |
|
54 | if obj.respond_to?(:project) && obj.project | |
| 55 | case field_format |
|
55 | case field_format | |
| 56 | when 'user' |
|
56 | when 'user' | |
| 57 | obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]} |
|
57 | obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]} | |
| @@ -36,6 +36,11 class CustomFieldUserFormatTest < ActiveSupport::TestCase | |||||
| 36 | assert_equal project.users.sort.collect(&:id).map(&:to_s), possible_values |
|
36 | assert_equal project.users.sort.collect(&:id).map(&:to_s), possible_values | |
| 37 | end |
|
37 | end | |
| 38 |
|
38 | |||
|
|
39 | def test_possible_values_with_nil_project_resource | |||
|
|
40 | project = Project.find(1) | |||
|
|
41 | assert_equal [], @field.possible_values(Issue.new) | |||
|
|
42 | end | |||
|
|
43 | ||||
| 39 | def test_possible_values_options_with_no_arguments |
|
44 | def test_possible_values_options_with_no_arguments | |
| 40 | assert_equal [], @field.possible_values_options |
|
45 | assert_equal [], @field.possible_values_options | |
| 41 | assert_equal [], @field.possible_values_options(nil) |
|
46 | assert_equal [], @field.possible_values_options(nil) | |
General Comments 0
You need to be logged in to leave comments.
Login now