Fixed: Custom 'version' field don't show shared versions (#8615).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7772 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
857cf5db38
commit
5b37920cce
|
@ -66,7 +66,7 @@ class CustomField < ActiveRecord::Base
|
||||||
when 'user'
|
when 'user'
|
||||||
obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}
|
obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}
|
||||||
when 'version'
|
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
|
end
|
||||||
elsif obj.is_a?(Array)
|
elsif obj.is_a?(Array)
|
||||||
obj.collect {|o| possible_values_options(o)}.inject {|memo, v| memo & v}
|
obj.collect {|o| possible_values_options(o)}.inject {|memo, v| memo & v}
|
||||||
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
# Redmine - project management software
|
||||||
|
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
require File.expand_path('../../test_helper', __FILE__)
|
||||||
|
|
||||||
|
class CustomFieldVersionFormatTest < ActiveSupport::TestCase
|
||||||
|
fixtures :custom_fields, :projects, :members, :users, :member_roles, :trackers, :issues, :versions
|
||||||
|
|
||||||
|
def setup
|
||||||
|
@field = IssueCustomField.create!(:name => 'Tester', :field_format => 'version')
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_possible_values_with_no_arguments
|
||||||
|
assert_equal [], @field.possible_values
|
||||||
|
assert_equal [], @field.possible_values(nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_possible_values_with_project_resource
|
||||||
|
project = Project.find(1)
|
||||||
|
possible_values = @field.possible_values(project.issues.first)
|
||||||
|
assert possible_values.any?
|
||||||
|
assert_equal project.shared_versions.sort.collect(&:id).map(&:to_s), possible_values
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_possible_values_with_nil_project_resource
|
||||||
|
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)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_possible_values_options_with_project_resource
|
||||||
|
project = Project.find(1)
|
||||||
|
possible_values_options = @field.possible_values_options(project.issues.first)
|
||||||
|
assert possible_values_options.any?
|
||||||
|
assert_equal project.shared_versions.sort.map {|u| [u.name, u.id.to_s]}, possible_values_options
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_possible_values_options_with_array
|
||||||
|
projects = Project.find([1, 2])
|
||||||
|
possible_values_options = @field.possible_values_options(projects)
|
||||||
|
assert possible_values_options.any?
|
||||||
|
assert_equal (projects.first.shared_versions & projects.last.shared_versions).sort.map {|u| [u.name, u.id.to_s]}, possible_values_options
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_cast_blank_value
|
||||||
|
assert_equal nil, @field.cast_value(nil)
|
||||||
|
assert_equal nil, @field.cast_value("")
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_cast_valid_value
|
||||||
|
version = @field.cast_value("2")
|
||||||
|
assert_kind_of Version, version
|
||||||
|
assert_equal Version.find(2), version
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_cast_invalid_value
|
||||||
|
assert_equal nil, @field.cast_value("187")
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue