| @@ -40,6 +40,7 class IssuesController < ApplicationController | |||||
| 40 | helper :attachments |
|
40 | helper :attachments | |
| 41 | include AttachmentsHelper |
|
41 | include AttachmentsHelper | |
| 42 | helper :queries |
|
42 | helper :queries | |
|
|
43 | include QueriesHelper | |||
| 43 | helper :sort |
|
44 | helper :sort | |
| 44 | include SortHelper |
|
45 | include SortHelper | |
| 45 | include IssuesHelper |
|
46 | include IssuesHelper | |
| @@ -144,13 +144,15 module Redmine | |||||
| 144 | # rows |
|
144 | # rows | |
| 145 | pdf.SetFontStyle('',8) |
|
145 | pdf.SetFontStyle('',8) | |
| 146 | pdf.SetFillColor(255, 255, 255) |
|
146 | pdf.SetFillColor(255, 255, 255) | |
| 147 | group = false |
|
147 | previous_group = false | |
| 148 | issues.each do |issue| |
|
148 | issues.each do |issue| | |
| 149 |
if query.grouped? && |
|
149 | if query.grouped? && (group = query.group_by_column.value(issue)) != previous_group | |
| 150 | group = issue.send(query.group_by) |
|
|||
| 151 | pdf.SetFontStyle('B',9) |
|
150 | pdf.SetFontStyle('B',9) | |
| 152 | pdf.Cell(277, row_height, "#{group.blank? ? 'None' : group.to_s}", 1, 1, 'L') |
|
151 | pdf.Cell(277, row_height, | |
|
|
152 | (group.blank? ? 'None' : group.to_s) + " (#{@issue_count_by_group[group]})", | |||
|
|
153 | 1, 1, 'L') | |||
| 153 | pdf.SetFontStyle('',8) |
|
154 | pdf.SetFontStyle('',8) | |
|
|
155 | previous_group = group | |||
| 154 | end |
|
156 | end | |
| 155 | pdf.Cell(15, row_height, issue.id.to_s, 1, 0, 'L', 1) |
|
157 | pdf.Cell(15, row_height, issue.id.to_s, 1, 0, 'L', 1) | |
| 156 | query.columns.each_with_index do |column, i| |
|
158 | query.columns.each_with_index do |column, i| | |
| @@ -236,6 +236,14 class IssuesControllerTest < ActionController::TestCase | |||||
| 236 | assert_equal 'application/pdf', @response.content_type |
|
236 | assert_equal 'application/pdf', @response.content_type | |
| 237 | end |
|
237 | end | |
| 238 |
|
238 | |||
|
|
239 | def test_index_pdf_with_query_grouped_by_list_custom_field | |||
|
|
240 | get :index, :project_id => 1, :query_id => 9, :format => 'pdf' | |||
|
|
241 | assert_response :success | |||
|
|
242 | assert_not_nil assigns(:issues) | |||
|
|
243 | assert_not_nil assigns(:issue_count_by_group) | |||
|
|
244 | assert_equal 'application/pdf', @response.content_type | |||
|
|
245 | end | |||
|
|
246 | ||||
| 239 | def test_index_sort |
|
247 | def test_index_sort | |
| 240 | get :index, :sort => 'tracker,id:desc' |
|
248 | get :index, :sort => 'tracker,id:desc' | |
| 241 | assert_response :success |
|
249 | assert_response :success | |
General Comments 0
You need to be logged in to leave comments.
Login now