From eba47e112e3ed7da16cdcacb98bb4abafc1eefaa Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 6 Dec 2019 00:28:18 +0000 Subject: [PATCH] Merged r19341 from trunk to 4.0-stable (#32500). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19343 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/timelog_helper.rb | 2 +- test/functional/timelog_report_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index 9cdfa9c13..c3dd63115 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -74,7 +74,7 @@ module TimelogHelper def report_to_csv(report) Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv| # Column headers - headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) } + headers = report.criteria.collect {|criteria| l_or_humanize(report.available_criteria[criteria][:label]) } headers += report.periods headers << l(:label_total_time) csv << headers diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index 4929ba286..b25059f3d 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -246,14 +246,14 @@ class TimelogReportTest < Redmine::ControllerTest :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", - :criteria => ["project", "user", "activity"], + :criteria => ["project", "user", "cf_10"], :format => "csv" } assert_response :success assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") # Headers - assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first + assert_equal 'Project,User,Overtime,2007-3,2007-4,Total time', lines.first # Total row assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last end -- 2.39.5