Merged r19458 from trunk to 4.1-stable (#32858).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19459 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-01-25 03:08:22 +00:00
parent d16a469f59
commit 848964fdb2
2 changed files with 21 additions and 1 deletions

View File

@@ -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)

View File

@@ -2437,6 +2437,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)