| @@ -280,7 +280,7 class ProjectsController < ApplicationController | |||
|
|
280 | 280 | render :action => 'list_issues' and return unless @query.valid? |
|
|
281 | 281 | |
|
|
282 | 282 | @issues = Issue.find :all, :order => sort_clause, |
|
|
283 | :include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ], | |
|
|
283 | :include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ], | |
|
|
284 | 284 | :conditions => @query.statement, |
|
|
285 | 285 | :limit => Setting.issues_export_limit |
|
|
286 | 286 | |
| @@ -289,6 +289,7 class ProjectsController < ApplicationController | |||
|
|
289 | 289 | CSV::Writer.generate(export, l(:general_csv_separator)) do |csv| |
|
|
290 | 290 | # csv header fields |
|
|
291 | 291 | headers = [ "#", l(:field_status), |
|
|
292 | l(:field_project), | |
|
|
292 | 293 | l(:field_tracker), |
|
|
293 | 294 | l(:field_priority), |
|
|
294 | 295 | l(:field_subject), |
| @@ -307,9 +308,10 class ProjectsController < ApplicationController | |||
|
|
307 | 308 | # csv lines |
|
|
308 | 309 | @issues.each do |issue| |
|
|
309 | 310 | fields = [issue.id, issue.status.name, |
|
|
311 | issue.project.name, | |
|
|
310 | 312 | issue.tracker.name, |
|
|
311 | 313 | issue.priority.name, |
|
|
312 |
issue.subject, |
|
|
|
314 | issue.subject, | |
|
|
313 | 315 | (issue.assigned_to ? issue.assigned_to.name : ""), |
|
|
314 | 316 | issue.author.name, |
|
|
315 | 317 | issue.start_date ? l_date(issue.start_date) : nil, |
| @@ -337,7 +339,7 class ProjectsController < ApplicationController | |||
|
|
337 | 339 | render :action => 'list_issues' and return unless @query.valid? |
|
|
338 | 340 | |
|
|
339 | 341 | @issues = Issue.find :all, :order => sort_clause, |
|
|
340 | :include => [ :author, :status, :tracker, :priority, :custom_values ], | |
|
|
342 | :include => [ :author, :status, :tracker, :priority, :project, :custom_values ], | |
|
|
341 | 343 | :conditions => @query.statement, |
|
|
342 | 344 | :limit => Setting.issues_export_limit |
|
|
343 | 345 | |
| @@ -41,7 +41,7 | |||
|
|
41 | 41 | pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1) |
|
|
42 | 42 | pdf.Cell(40, row_height, issue.author.name, 0, 0, 'L', 1) |
|
|
43 | 43 | pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1) |
|
|
44 | pdf.MultiCell(0, row_height, issue.subject) | |
|
|
44 | pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}")) | |
|
|
45 | 45 | pdf.Line(10, pdf.GetY, 287, pdf.GetY) |
|
|
46 | 46 | pdf.SetY(pdf.GetY() + 1) |
|
|
47 | 47 | end |
| @@ -59,10 +59,10 | |||
|
|
59 | 59 | <tr class="<%= cycle("odd", "even") %>"> |
|
|
60 | 60 | <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th> |
|
|
61 | 61 | <td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td> |
|
|
62 | <td align="center"><%= issue.tracker.name %> <%= "(#{issue.project.name})" unless @project && @project == issue.project %></td> | |
|
|
62 | <td align="center"><%= issue.tracker.name %></td> | |
|
|
63 | 63 | <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td> |
|
|
64 | 64 | <td align="center"><%= issue.priority.name %></td> |
|
|
65 | <td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td> | |
|
|
65 | <td><%= "#{issue.project.name} - " unless @project && @project == issue.project %><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td> | |
|
|
66 | 66 | <td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td> |
|
|
67 | 67 | <td align="center"><%= format_time(issue.updated_on) %></td> |
|
|
68 | 68 | </tr> |
General Comments 0
You need to be logged in to leave comments.
Login now