diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-03-04 07:47:30 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-03-04 07:47:30 +0000 |
| commit | 23703c3afd20ade76fae436bda3a41c261cce632 (patch) | |
| tree | 41770e5a298ca8d6b3e57ad435c406fd7017479b | |
| parent | 29dbf626b21a6092bf25d3da0203609f0619ddea (diff) | |
| download | redmine-23703c3afd20ade76fae436bda3a41c261cce632.tar.gz redmine-23703c3afd20ade76fae436bda3a41c261cce632.zip | |
Merged r19554 from trunk to 4.0-stable (#33052).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19558 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/timelog_helper.rb | 10 | ||||
| -rw-r--r-- | test/functional/timelog_report_test.rb | 15 |
2 files changed, 24 insertions, 1 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index c3dd63115..5c6ca220a 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -63,7 +63,15 @@ module TimelogHelper "[#{l(:label_none)}]" elsif k = criteria_options[:klass] obj = k.find_by_id(value.to_i) - format_object(obj, html) + if obj.is_a?(Issue) + if obj.visible? + html ? link_to_issue(obj) : "#{obj.tracker} ##{obj.id}: #{obj.subject}" + else + "##{obj.id}" + end + else + format_object(obj, html) + end elsif cf = criteria_options[:custom_field] format_value(value, cf) else diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index 73814b547..0bf7b9a63 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -258,6 +258,21 @@ class TimelogReportTest < Redmine::ControllerTest assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last end + def test_report_csv_should_fill_issue_criteria_with_tracker_id_and_subject + get :report, :params => { + :project_id => 1, + :columns => 'month', + :from => "2007-01-01", + :to => "2007-06-30", + :criteria => ["issue"], + :format => "csv" + } + + assert_response :success + lines = @response.body.chomp.split("\n") + assert lines.detect {|line| line.include?('Bug #1: Cannot print recipes')} + end + def test_csv_big_5 str_utf8 = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8') str_big5 = "\xa4@\xa4\xeb".force_encoding('Big5') |