From b2ba7db4e1489fca318999214764bac82602fa26 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 5 Nov 2014 15:23:22 +0000 Subject: Time entries CSV export should include the tracker and subject of the issue (#18269). git-svn-id: http://svn.redmine.org/redmine/trunk@13562 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 9f6c07b36..583d1b104 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -122,16 +122,20 @@ module QueriesHelper end end - def csv_value(column, issue, value) + def csv_value(column, object, value) format_object(value, false) do |value| case value.class.name when 'Float' sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator)) when 'IssueRelation' - other = value.other_issue(issue) - l(value.label_for(issue)) + " ##{other.id}" + other = value.other_issue(object) + l(value.label_for(object)) + " ##{other.id}" when 'Issue' - value.id + if object.is_a?(TimeEntry) + "#{value.tracker} ##{value.id}: #{value.subject}" + else + value.id + end else value end -- cgit v1.2.3