Patch for bug 277618: Move FormatTimeUnit() out of globals.pl; patch by Max K-A <mkanat@kerio.com>, r=wurblzap, a=myk.

git-svn-id: svn://10.0.0.236/trunk@167815 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jocuri%softhome.net
2005-01-16 13:25:46 +00:00
parent e71b259da8
commit 51659a5aa5
3 changed files with 23 additions and 18 deletions

View File

@@ -182,7 +182,7 @@ sub ProcessOneBug($) {
if ($values{'qa_contact'}) {
$values{'qa_contact'} = DBID_to_name($values{'qa_contact'});
}
$values{'estimated_time'} = FormatTimeUnit($values{'estimated_time'});
$values{'estimated_time'} = format_time_decimal($values{'estimated_time'});
my @dependslist;
SendSQL("SELECT dependson FROM dependencies WHERE
@@ -235,8 +235,8 @@ sub ProcessOneBug($) {
$what =~ s/^(Attachment )?/Attachment #$attachid / if $attachid;
if( $fieldname eq 'estimated_time' ||
$fieldname eq 'remaining_time' ) {
$old = FormatTimeUnit($old);
$new = FormatTimeUnit($new);
$old = format_time_decimal($old);
$new = format_time_decimal($new);
}
if ($attachid) {
SendSQL("SELECT isprivate FROM attachments

View File

@@ -32,7 +32,8 @@ use base qw(Exporter);
html_quote url_quote value_quote xml_quote
css_class_quote
lsearch max min
trim diff_strings format_time);
trim diff_strings
format_time format_time_decimal);
use Bugzilla::Config;
@@ -207,6 +208,18 @@ sub format_time {
return $time;
}
sub format_time_decimal {
my ($time) = (@_);
my $newtime = sprintf("%.2f", $time);
if ($newtime =~ /0\Z/) {
$newtime = sprintf("%.1f", $time);
}
return $newtime;
}
1;
__END__
@@ -373,5 +386,11 @@ will be expanded in the future to adjust for user preferences regarding what
timezone to display times in. In the future, it may also allow for the time to be
shown in different formats.
=item C<format_time_decimal($time)>
Returns a number with 2 digit precision, unless the last digit is a 0. Then it
returns only 1 digit precision.
=back