From 2d612f32b7c06073ad3b76d9038a26390a98c7dd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 22 Nov 2014 10:35:38 +0000 Subject: [PATCH] Merged r13562 (#18269). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 12 ++++++++---- test/functional/timelog_controller_test.rb | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index c27ccf1a5..0ab6bad90 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 diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index cc76cba21..67a141adf 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -714,4 +714,14 @@ class TimelogControllerTest < ActionController::TestCase assert_response :success assert_equal 'text/csv; header=present', response.content_type end + + def test_index_csv_should_fill_issue_column_with_tracker_id_and_subject + issue = Issue.find(1) + entry = TimeEntry.generate!(:issue => issue, :comments => "Issue column content test") + + get :index, :format => 'csv' + line = response.body.split("\n").detect {|l| l.include?(entry.comments)} + assert_not_nil line + assert_include "#{issue.tracker} #1: #{issue.subject}", line + end end -- 2.39.5