From 46880686bf2e7f0ae74990f5faa30aacb993cce2 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 5 Jan 2026 08:23:51 +0000 Subject: [PATCH] Merge r24259 from trunk to 6.0-stable (#43521). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@24261 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/custom_field.rb | 2 +- test/unit/custom_field_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index ec8c5de8d..ec2991e40 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -157,7 +157,7 @@ class CustomField < ApplicationRecord end end - if default_value.present? + if default_value.present? && errors[:regexp].blank? validate_field_value(default_value).each do |message| errors.add :default_value, message end diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb index 608176559..48b5b914a 100644 --- a/test/unit/custom_field_test.rb +++ b/test/unit/custom_field_test.rb @@ -48,6 +48,15 @@ class CustomFieldTest < ActiveSupport::TestCase assert field.save end + def test_regexp_validation_with_invalid_regex_and_default_value + field = IssueCustomField.new(:name => 'regexp', :field_format => 'text', :regexp => '[', :default_value => 'abc') + assert !field.save + assert_include I18n.t('activerecord.errors.messages.invalid'), + field.errors[:regexp] + field.regexp = '[a-z0-9]' + assert field.save + end + def test_default_value_should_be_validated field = CustomField.new(:name => 'Test', :field_format => 'int') field.default_value = 'abc'