From 8be3e7878d5d9837c3961c53c137f40d3ee6d6f0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 29 Nov 2018 15:44:21 +0000 Subject: [PATCH] Merged r17645 to 3.4-stable (#29674). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17654 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 10 ++++++++++ .../lib/redmine/field_format/list_format_test.rb | 10 ++++++++++ .../field_format/user_field_format_test.rb | 15 +++++++++++++++ .../field_format/version_field_format_test.rb | 14 ++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index 497147388..e4bad2863 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -736,6 +736,16 @@ module Redmine options end + def validate_custom_value(custom_value) + values = Array.wrap(custom_value.value).reject {|value| value.to_s == ''} + invalid_values = values - possible_custom_value_options(custom_value).map(&:last) + if invalid_values.any? + [::I18n.t('activerecord.errors.messages.inclusion')] + else + [] + end + end + def order_statement(custom_field) if target_class.respond_to?(:fields_for_order_statement) target_class.fields_for_order_statement(value_join_alias(custom_field)) diff --git a/test/unit/lib/redmine/field_format/list_format_test.rb b/test/unit/lib/redmine/field_format/list_format_test.rb index 9c23fd075..313064959 100644 --- a/test/unit/lib/redmine/field_format/list_format_test.rb +++ b/test/unit/lib/redmine/field_format/list_format_test.rb @@ -37,6 +37,16 @@ class Redmine::ListFieldFormatTest < ActionView::TestCase assert group.valid? end + def test_non_existing_value_should_be_invalid + field = GroupCustomField.create!(:name => 'List', :field_format => 'list', :possible_values => ['Foo', 'Bar']) + group = Group.new(:name => 'Group') + group.custom_field_values = {field.id => 'Baz'} + + assert_not_include 'Baz', field.possible_custom_value_options(group.custom_value_for(field)) + assert_equal false, group.valid? + assert_include "List #{::I18n.t('activerecord.errors.messages.inclusion')}", group.errors.full_messages.first + end + def test_edit_tag_should_have_id_and_name field = IssueCustomField.new(:field_format => 'list', :possible_values => ['Foo', 'Bar'], :is_required => false) value = CustomFieldValue.new(:custom_field => field, :customized => Issue.new) diff --git a/test/unit/lib/redmine/field_format/user_field_format_test.rb b/test/unit/lib/redmine/field_format/user_field_format_test.rb index 802fa7a34..7c726957f 100644 --- a/test/unit/lib/redmine/field_format/user_field_format_test.rb +++ b/test/unit/lib/redmine/field_format/user_field_format_test.rb @@ -45,6 +45,21 @@ class Redmine::UserFieldFormatTest < ActionView::TestCase assert issue.valid? end + def test_non_existing_values_should_be_invalid + field = IssueCustomField.create!(:name => 'Foo', :field_format => 'user', :is_for_all => true, :trackers => Tracker.all) + project = Project.generate! + user = User.generate! + User.add_to_project(user, project, Role.find_by_name('Developer')) + + field.user_role = [Role.find_by_name('Manager').id] + field.save! + + issue = Issue.new(:project_id => project.id, :tracker_id => 1, :custom_field_values => {field.id => user.id}) + assert_not_include [user.name, user.id.to_s], field.possible_custom_value_options(issue.custom_value_for(field)) + assert_equal false, issue.valid? + assert_include "Foo #{::I18n.t('activerecord.errors.messages.inclusion')}", issue.errors.full_messages.first + end + def test_possible_values_options_should_return_project_members field = IssueCustomField.new(:field_format => 'user') project = Project.find(1) diff --git a/test/unit/lib/redmine/field_format/version_field_format_test.rb b/test/unit/lib/redmine/field_format/version_field_format_test.rb index 12de01479..34e492b28 100644 --- a/test/unit/lib/redmine/field_format/version_field_format_test.rb +++ b/test/unit/lib/redmine/field_format/version_field_format_test.rb @@ -49,6 +49,20 @@ class Redmine::VersionFieldFormatTest < ActionView::TestCase assert issue.valid? end + def test_not_existing_values_should_be_invalid + field = IssueCustomField.create!(:name => 'Foo', :field_format => 'version', :is_for_all => true, :trackers => Tracker.all) + project = Project.generate! + version = Version.generate!(:project => project, :status => 'closed') + + field.version_status = ["open"] + field.save! + + issue = Issue.new(:project_id => project.id, :tracker_id => 1, :custom_field_values => {field.id => version.id}) + assert_not_include [version.name, version.id.to_s], field.possible_custom_value_options(issue.custom_value_for(field)) + assert_equal false, issue.valid? + assert_include "Foo #{::I18n.t('activerecord.errors.messages.inclusion')}", issue.errors.full_messages.first + end + def test_possible_values_options_should_return_project_versions field = IssueCustomField.new(:field_format => 'version') project = Project.find(1) -- 2.39.5