kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes time syntax case insensitive (#10635).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9387 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-11 17:37:13 +00:00
parent 1511b1435a
commit de0689d4f4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/core_ext/string/conversions.rb
View File

@ -30,7 +30,7 @@ module Redmine #:nodoc:
# 2:30 => 2.5 # 2:30 => 2.5
s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 } s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
# 2h30, 2h, 30m => 2.5, 2, 0.5 # 2h30, 2h, 30m => 2.5, 2, 0.5
s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] } s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}i) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
end end
# 2,5 => 2.5 # 2,5 => 2.5
s.gsub!(',', '.') s.gsub!(',', '.')

1
test/unit/time_entry_test.rb
View File

@ -45,6 +45,7 @@ class TimeEntryTest < ActiveSupport::TestCase
"3 h 15 m" => 3.25, "3 h 15 m" => 3.25,
"3 hours" => 3.0, "3 hours" => 3.0,
"12min" => 0.2, "12min" => 0.2,
"12 Min" => 0.2,
} }
assertions.each do |k, v| assertions.each do |k, v|