Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 16:26:03 +01:00
Code Issues Packages Projects Releases Activity

format_hours method produces incorrect output for negative time values when Setting.timespan_format is "minutes" (#42172).

Browse Source 
Patch by Go MAEDA (user:maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@23482 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2025-01-30 22:11:19 +00:00
parent c252857414
commit 09167d0b32
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/redmine/i18n.rb
View File

@@ -94,8 +94,9 @@ module Redmine
minutes = (hours * 60).round
if Setting.timespan_format == 'minutes'
h, m = minutes.divmod(60)
"%d:%02d" % [h, m]
h, m = minutes.abs.divmod(60)
sign = minutes.negative? ? '-' : ''
"%s%d:%02d" % [sign, h, m]
else
number_with_delimiter(sprintf('%.2f', minutes.fdiv(60)), delimiter: nil)
end

4
test/helpers/application_helper_test.rb
View File

@@ -2210,11 +2210,15 @@ class ApplicationHelperTest < Redmine::HelperTest
set_language_if_valid 'en'
with_settings :timespan_format => 'minutes' do
assert_equal '-0:45', format_hours(-0.75)
assert_equal '0:00', format_hours(0)
assert_equal '0:45', format_hours(0.75)
assert_equal '0:45 h', l_hours_short(0.75)
assert_equal '0:45 hour', l_hours(0.75)
end
with_settings :timespan_format => 'decimal' do
assert_equal '-0.75', format_hours(-0.75)
assert_equal '0.00', format_hours(0)
assert_equal '0.75', format_hours(0.75)
assert_equal '0.75 h', l_hours_short(0.75)
assert_equal '0.75 hour', l_hours(0.75)