Merged r22895 and r22896 from trunk to 5.1-stable (#40860).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22900 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-06-27 04:49:38 +00:00
parent 940dfa21fa
commit 15223f559e
2 changed files with 11 additions and 1 deletions

View File

@@ -2069,7 +2069,7 @@ class Issue < ActiveRecord::Base
tracker.disabled_core_fields.each do |attribute|
send "#{attribute}=", nil
end
self.priority_id ||= IssuePriority.default&.id || IssuePriority.active.first.id
self.priority_id ||= IssuePriority.default&.id || IssuePriority.active.first&.id
self.done_ratio ||= 0
end
end

View File

@@ -83,6 +83,16 @@ class IssueTest < ActiveSupport::TestCase
assert_save issue
end
def test_create_with_no_priority_defined
IssuePriority.delete_all
issue = Issue.new(
project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create_with_no_priority_defined'
)
assert_nothing_raised {assert_not issue.save}
assert_include 'Priority cannot be blank', issue.errors.full_messages
end
def test_default_priority_should_be_set_when_priority_field_is_disabled
tracker = Tracker.find(1)
tracker.core_fields = tracker.core_fields - ['priority_id']