kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pdf: lib: add "attachments" parameter at RDMwriteHTMLCell method (#3261) 

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7913 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-11-24 11:11:01 +00:00
parent f936b7b5a4
commit 1b4fc4aee8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/redmine/export/pdf.rb
View File

@ -112,8 +112,11 @@ module Redmine
MultiCell(w, h, fix_text_encoding(txt), border, align, fill, ln)
end
def RDMwriteHTMLCell(w, h, x, y, html='', border=0, ln=1, fill=0)
writeHTMLCell(w, h, x, y, fix_text_encoding(html), border, ln, fill)
def RDMwriteHTMLCell(w, h, x, y, txt='', attachments=[], border=0, ln=1, fill=0)
writeHTMLCell(w, h, x, y,
fix_text_encoding(
Redmine::WikiFormatting.to_html(Setting.text_formatting, txt)),
border, ln, fill)
end
def Footer
@ -359,8 +362,7 @@ module Redmine
# Set resize image scale
pdf.SetImageScale(1.6)
pdf.RDMwriteHTMLCell(35+155, 5, 0, 0,
Redmine::WikiFormatting.to_html(
Setting.text_formatting, issue.description.to_s),"LRB")
issue.description.to_s, issue.attachments, "LRB")
unless issue.leaf?
# for CJK
@ -427,8 +429,7 @@ module Redmine
unless changeset.comments.blank?
pdf.SetFontStyle('',8)
pdf.RDMwriteHTMLCell(190,5,0,0,
Redmine::WikiFormatting.to_html(
Setting.text_formatting, changeset.comments.to_s), "")
changeset.comments.to_s, issue.attachments, "")
end
pdf.Ln
end
@ -452,8 +453,7 @@ module Redmine
pdf.Ln unless journal.details.empty?
pdf.SetFontStyle('',8)
pdf.RDMwriteHTMLCell(190,5,0,0,
Redmine::WikiFormatting.to_html(
Setting.text_formatting, journal.notes.to_s), "")
journal.notes.to_s, issue.attachments, "")
end
pdf.Ln
end
@ -489,8 +489,7 @@ module Redmine
pdf.SetImageScale(1.6)
pdf.SetFontStyle('',9)
pdf.RDMwriteHTMLCell(190,5,0,0,
Redmine::WikiFormatting.to_html(
Setting.text_formatting, page.content.text.to_s), "TLRB")
page.content.text.to_s, page.attachments, "TLRB")
if page.attachments.any?
pdf.Ln
pdf.SetFontStyle('B',9)