Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-20 14:33:06 +01:00
Code Issues Packages Projects Releases Activity

Merged r17144 to 3.4-stable (#27881).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17145 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2018-01-07 21:43:04 +00:00
parent 2a54a539bb
commit e8bc1dbaa8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue.rb
View File

@@ -441,7 +441,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',

2
test/unit/issue_test.rb
View File

@@ -128,7 +128,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