diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-01-25 03:07:00 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-01-25 03:07:00 +0000 |
| commit | 8dbbfd61725577fb45faa5dbd0cbccf252aa6417 (patch) | |
| tree | ee519e91ba9ef189187668efe370edc75c117f9c | |
| parent | 0c71a982e01f146fc7b30da04bf6757b363eb51a (diff) | |
| download | redmine-8dbbfd61725577fb45faa5dbd0cbccf252aa6417.tar.gz redmine-8dbbfd61725577fb45faa5dbd0cbccf252aa6417.zip | |
Exporting issue as PDF fails when the issue has private journal (#32858).
Patch by Kouhei Sutou.
git-svn-id: http://svn.redmine.org/redmine/trunk@19458 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/export/pdf/issues_pdf_helper.rb | 2 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb index 15c0b43cc..81f1a8174 100644 --- a/lib/redmine/export/pdf/issues_pdf_helper.rb +++ b/lib/redmine/export/pdf/issues_pdf_helper.rb @@ -212,7 +212,7 @@ module Redmine assoc[:journals].each do |journal| pdf.SetFontStyle('B',8) title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}" - title << " (#{l(:field_private_notes)})" if journal.private_notes? + title += " (#{l(:field_private_notes)})" if journal.private_notes? pdf.RDMCell(190,5, title) pdf.ln pdf.SetFontStyle('I',8) diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index cf2a81931..9c793fdeb 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2738,6 +2738,26 @@ class IssuesControllerTest < Redmine::ControllerTest assert @response.body.starts_with?('%PDF') end + def test_show_export_to_pdf_with_private_journal + Journal.create!( + :journalized => Issue.find(1), + :notes => 'Private notes', + :private_notes => true, + :user_id => 3 + ) + @request.session[:user_id] = 3 + get( + :show, + :params => { + :id => 1, + :format => 'pdf' + } + ) + assert_response :success + assert_equal 'application/pdf', @response.content_type + assert @response.body.starts_with?('%PDF') + end + def test_show_export_to_pdf_with_changesets [[100], [100, 101], [100, 101, 102]].each do |cs| issue1 = Issue.find(3) |