##// END OF EJS Templates
Merged r11920 and r11921 from trunk to 2.3-stable (#14178)...
Toshi MARUYAMA -
r11694:6ce685a63c9d
parent child
Show More
@@ -394,7 +394,7 module Redmine
394
394
395 # write the cells on page
395 # write the cells on page
396 issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true)
396 issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true)
397 issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width)
397 issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
398 pdf.SetY(base_y + max_height);
398 pdf.SetY(base_y + max_height);
399
399
400 # rows
400 # rows
@@ -474,7 +474,7 module Redmine
474
474
475 # write the cells on page
475 # write the cells on page
476 issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
476 issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
477 issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width)
477 issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
478 pdf.SetY(base_y + max_height);
478 pdf.SetY(base_y + max_height);
479
479
480 if query.has_column?(:description) && issue.description?
480 if query.has_column?(:description) && issue.description?
@@ -511,7 +511,10 module Redmine
511 end
511 end
512
512
513 # Draw lines to close the row (MultiCell border drawing in not uniform)
513 # Draw lines to close the row (MultiCell border drawing in not uniform)
514 def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, col_widths)
514 #
515 # parameter "col_id_width" is not used. it is kept for compatibility.
516 def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y,
517 col_id_width, col_widths)
515 col_x = top_x
518 col_x = top_x
516 pdf.Line(col_x, top_y, col_x, lower_y) # id right border
519 pdf.Line(col_x, top_y, col_x, lower_y) # id right border
517 col_widths.each do |width|
520 col_widths.each do |width|
General Comments 0
You need to be logged in to leave comments. Login now