From: Toshi MARUYAMA Date: Tue, 4 Jun 2013 12:42:29 +0000 (+0000) Subject: Merged r11920 and r11921 from trunk to 2.3-stable (#14178) X-Git-Tag: 2.3.2~16 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ce685a63c9df18e5e686a7759132d905a947a31;p=redmine.git Merged r11920 and r11921 from trunk to 2.3-stable (#14178) pdf: restore "col_id_width" parameter of issues_to_pdf_draw_borders. Contributed by Massimo Rossello. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11924 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 139416798..4d85c7d3e 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -394,7 +394,7 @@ module Redmine # write the cells on page issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true) - issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width) + issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width) pdf.SetY(base_y + max_height); # rows @@ -474,7 +474,7 @@ module Redmine # write the cells on page issues_to_pdf_write_cells(pdf, col_values, col_width, row_height) - issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width) + issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width) pdf.SetY(base_y + max_height); if query.has_column?(:description) && issue.description? @@ -511,7 +511,10 @@ module Redmine end # Draw lines to close the row (MultiCell border drawing in not uniform) - def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, col_widths) + # + # parameter "col_id_width" is not used. it is kept for compatibility. + def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, + col_id_width, col_widths) col_x = top_x pdf.Line(col_x, top_y, col_x, lower_y) # id right border col_widths.each do |width|