diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-01-07 21:43:44 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-01-07 21:43:44 +0000 |
| commit | 0acf526cf344f9685ce15e0d13b11e96e5d96bba (patch) | |
| tree | b21bcfbc4232ec840f18655ab98bf72175b14e2e | |
| parent | 1d1fbff99df59ddb3b8367740718173b9a37c5c0 (diff) | |
| download | redmine-0acf526cf344f9685ce15e0d13b11e96e5d96bba.tar.gz redmine-0acf526cf344f9685ce15e0d13b11e96e5d96bba.zip | |
Merged r17144 to 3.3-stable (#27881).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17146 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | test/unit/issue_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 4f9520cc7..a7af6c61c 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -424,7 +424,7 @@ class Issue < ActiveRecord::Base end def estimated_hours=(h) - write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h) + write_attribute :estimated_hours, (h.is_a?(String) ? (h.to_hours || h) : h) end safe_attributes 'project_id', diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index dfed9b111..027e9fd9a 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -127,7 +127,7 @@ class IssueTest < ActiveSupport::TestCase def test_estimated_hours_should_be_validated set_language_if_valid 'en' - ['-2'].each do |invalid| + ['-2', '123abc'].each do |invalid| issue = Issue.new(:estimated_hours => invalid) assert !issue.valid? assert_include 'Estimated time is invalid', issue.errors.full_messages |