Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-04-03 02:59:33 +02:00
Code Issues Packages Projects Releases Activity

Merge r24259 from trunk to 6.0-stable (#43521).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@24261 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2026-01-05 08:23:51 +00:00
parent 33efcaa8b4
commit 46880686bf
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/custom_field.rb
View File

@@ -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

9
test/unit/custom_field_test.rb
View File

@@ -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'