Merged r17144 to 3.4-stable (#27881).

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

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