summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2017-12-06 14:25:35 +0000
committerGo MAEDA <maeda@farend.jp>2017-12-06 14:25:35 +0000
commitd6d2d233659101e312cc61edfe039b37e5a73025 (patch)
tree859eb2b98a3834886df46948921a4fba6f4d4b03
parentae842a73db70aecdabf360981f7c36d3b156fc07 (diff)
downloadredmine-d6d2d233659101e312cc61edfe039b37e5a73025.tar.gz
redmine-d6d2d233659101e312cc61edfe039b37e5a73025.zip
Fix: Round floats to 2 digits when rendering an issue list to PDF (#12510).
Patch by Holger Just and Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17059 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/export/pdf/issues_pdf_helper.rb2
-rw-r--r--test/unit/lib/redmine/export/pdf/issues_pdf_test.rb35
2 files changed, 37 insertions, 0 deletions
diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb
index a6db6931f..7e2c8a85f 100644
--- a/lib/redmine/export/pdf/issues_pdf_helper.rb
+++ b/lib/redmine/export/pdf/issues_pdf_helper.rb
@@ -384,6 +384,8 @@ module Redmine
format_date(value)
elsif value.is_a?(Time)
format_time(value)
+ elsif value.is_a?(Float)
+ sprintf "%.2f", value
else
value
end
diff --git a/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb b/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb
new file mode 100644
index 000000000..eafc97b81
--- /dev/null
+++ b/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb
@@ -0,0 +1,35 @@
+# Redmine - project management software
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require File.expand_path('../../../../../../test_helper', __FILE__)
+
+class IssuesPdfHelperTest < ActiveSupport::TestCase
+ include Redmine::Export::PDF::IssuesPdfHelper
+
+ def test_fetch_row_values_should_round_float_values
+ query = IssueQuery.new(:project => Project.find(1), :name => '_')
+ query.column_names = [:subject, :spent_hours]
+
+
+ issue = Issue.find(2)
+ TimeEntry.create(:spent_on => Date.today, :hours => 4.3432, :user => User.find(1), :project_id => 1, :issue => issue, :activity => TimeEntryActivity.first)
+
+ results = fetch_row_values(issue, query, 0)
+
+ assert_equal ["2", "Add ingredients categories", "4.34"], results
+ end
+end