From 7436169bd151d20ed84a2ef02ec83b6f02ac81d4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 22 Nov 2014 10:31:35 +0000 Subject: [PATCH] Merged r13555 (#13608). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 2 ++ test/functional/issues_controller_test.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index ca8d2537b..5699419b0 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -128,6 +128,8 @@ module QueriesHelper when 'IssueRelation' other = value.other_issue(issue) l(value.label_for(issue)) + " ##{other.id}" + when 'Issue' + value.id else value end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 44c43e3b2..db04fda28 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -472,6 +472,18 @@ class IssuesControllerTest < ActionController::TestCase end end + def test_index_csv_should_fill_parent_column_with_parent_id + Issue.delete_all + parent = Issue.generate! + child = Issue.generate!(:parent_issue_id => parent.id) + + with_settings :default_language => 'en' do + get :index, :format => 'csv', :c => %w(parent) + end + lines = response.body.split + assert_include "#{child.id},#{parent.id}", lines + end + def test_index_csv_big_5 with_settings :default_language => "zh-TW" do str_utf8 = "\xe4\xb8\x80\xe6\x9c\x88" -- 2.39.5