From fd6fea57136b86187181b338cae128d5a7b80d03 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 6 Feb 2014 03:34:09 +0000 Subject: [PATCH] Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at lib/redmine/export/pdf.rb git-svn-id: http://svn.redmine.org/redmine/trunk@12832 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/export/pdf.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index bf0548110..bd1e64c6e 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -604,13 +604,12 @@ module Redmine unless issue.leaf? # for CJK truncate_length = ( l(:general_pdf_encoding).upcase == "UTF-8" ? 90 : 65 ) - pdf.SetFontStyle('B',9) pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR") pdf.Ln issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level| - buf = truncate("#{child.tracker} # #{child.id}: #{child.subject}", - :length => truncate_length) + buf = "#{child.tracker} # #{child.id}: #{child.subject}". + truncate(truncate_length) level = 10 if level >= 10 pdf.SetFontStyle('',8) pdf.RDMCell(35+135,5, (level >=1 ? " " * level : "") + buf, "L") @@ -624,7 +623,6 @@ module Redmine unless relations.empty? # for CJK truncate_length = ( l(:general_pdf_encoding).upcase == "UTF-8" ? 80 : 60 ) - pdf.SetFontStyle('B',9) pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR") pdf.Ln @@ -639,7 +637,7 @@ module Redmine end buf += "#{relation.other_issue(issue).tracker}" + " # #{relation.other_issue(issue).id}: #{relation.other_issue(issue).subject}" - buf = truncate(buf, :length => truncate_length) + buf = buf.truncate(truncate_length) pdf.SetFontStyle('', 8) pdf.RDMCell(35+155-60, 5, buf, "L") pdf.SetFontStyle('B',8)