From 477023a2586074e14d427ffaa69a6e4b679594e0 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Thu, 5 Mar 2015 13:04:50 +0300 Subject: [PATCH] Remove trailing zeros in search, fix removal in bug getter --- Bugzilla/Bug.pm | 2 +- template/en/default/list/table.html.tmpl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 9a93f6c4e..61bcf7411 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -4257,7 +4257,7 @@ sub get_value if (defined $self->{$attr}) { - $self->{$attr} =~ s/\.?0+$//so if $field && $field->type == FIELD_TYPE_NUMERIC; + $self->{$attr} =~ s/((\.\d*[1-9])|\.)0+$/$2/so if $field && $field->type == FIELD_TYPE_NUMERIC; return $self->{$attr}; } diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 0a2905040..63145f1ca 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -222,6 +222,9 @@ [% SET url_quoted = bug.$column | url_quote_ns %] [% bug.$column | html %] [% END %] + [% ELSIF field_obj.type == constants.FIELD_TYPE_NUMERIC %] + [%# Remove trailing zeros %] + [% bug.$column.replace('((\.\d*[1-9])|\.)0+$', '$2') %] [% ELSIF column == 'work_time' || column == 'remaining_time' || column == 'estimated_time' ||