From a87f724ad529e71386352f0b38d52185ba7f052c Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 22 Mar 2022 06:52:09 +0000 Subject: [PATCH] Merged r21488 and r21489 to 4.2-stable (#36593). git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21491 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project.rb | 11 +++++++++++ test/unit/project_test.rb | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/app/models/project.rb b/app/models/project.rb index 2845db235..2d2ff5748 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -968,6 +968,17 @@ class Project < ActiveRecord::Base end end + # Overrides Redmine::Acts::Customizable::InstanceMethods#validate_custom_field_values + # so that custom values that are not editable are not validated (eg. a custom field that + # is marked as required should not trigger a validation error if the user is not allowed + # to edit this field). + def validate_custom_field_values + user = User.current + if new_record? || custom_field_values_changed? + editable_custom_field_values(user).each(&:validate_value) + end + end + # Returns the custom_field_values that can be edited by the given user def editable_custom_field_values(user=nil) visible_custom_field_values(user) diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 63f1e01b7..10d55b999 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -348,6 +348,13 @@ class ProjectTest < ActiveSupport::TestCase assert_equal parent.children.sort_by(&:name), parent.children.to_a end + def test_validate_custom_field_values_of_project + User.current = User.find(3) + ProjectCustomField.generate!(:name => 'CustomFieldTest', :field_format => 'int', :is_required => true, :visible => false, :role_ids => [1]) + p = Project.new(:name => 'Project test', :identifier => 'project-t') + assert p.save! + end + def test_set_parent_should_update_issue_fixed_version_associations_when_a_fixed_version_is_moved_out_of_the_hierarchy # Parent issue with a hierarchy project's fixed version parent_issue = Issue.find(1) -- 2.39.5