Commit 40746194 authored by maeda's avatar maeda

Use the id field as project_key in...

Use the id field as project_key in ProjectCustomField#visibility_by_project_condition by default (#29161).

Patch by Holger Just.


git-svn-id: https://svn.redmine.org/redmine/trunk@17517 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent bf5cc2d5
......@@ -19,4 +19,9 @@ class ProjectCustomField < CustomField
def type_name
:label_project_plural
end
def visibility_by_project_condition(project_key=nil, user=User.current, id_column=nil)
project_key ||= "#{Project.table_name}.id"
super(project_key, user, id_column)
end
end
......@@ -340,4 +340,20 @@ class CustomFieldTest < ActiveSupport::TestCase
assert_equal 12.5, field.cast_value('+12.5')
assert_equal -12.5, field.cast_value('-12.5')
end
def test_project_custom_field_visibility
project_field = ProjectCustomField.generate!(:visible => false, :field_format => 'list', :possible_values => %w[a b c])
project = Project.find(3)
project.custom_field_values = { project_field.id => 'a' }
# Admins can find projects with the field
with_current_user(User.find(1)) do
assert_includes Project.where(project_field.visibility_by_project_condition), project
end
# The field is not visible to normal users
with_current_user(User.find(2)) do
refute_includes Project.where(project_field.visibility_by_project_condition), project
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment