Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-31 03:40:24 +01:00
Code Issues Packages Projects Releases Activity

Merged r19341 from trunk to 4.0-stable (#32500).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19343 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-12-06 00:28:18 +00:00
parent 0e321e6a86
commit eba47e112e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/timelog_helper.rb
View File

@@ -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

4
test/functional/timelog_report_test.rb
View File

@@ -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