jro_apps/redmine Commit - r493:7faf77804d17

Subproject name added in csv and pdf exports....

Jean-Philippe Lang -

r493:7faf77804d17

parent child

Context file:

r493:7faf77804d17

Collapse all files

app/controllers/projects_controller.rb +5 -3

                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
-            						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
+            						:include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status),
+                                   l(:field_project),
                                    l(:field_tracker),
                                    l(:field_priority),
                                    l(:field_subject),
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name,
+                                        issue.project.name,
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
                                         (issue.assigned_to ? issue.assigned_to.name : ""),
                                         issue.author.name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
-            						:include => [ :author, :status, :tracker, :priority, :custom_values ],
+            						:include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit

app/views/projects/export_issues_pdf.rfpdf +1 -1

             	   	pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)
             	   	pdf.Cell(40, row_height, issue.author.name, 0, 0, 'L', 1)
             	   	pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)
-            	   	pdf.MultiCell(0, row_height, issue.subject)
+            	   	pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))
                		pdf.Line(10, pdf.GetY, 287, pdf.GetY)
                		pdf.SetY(pdf.GetY() + 1)
             	end

app/views/projects/list_issues.rhtml +2 -2

             	<tr class="<%= cycle("odd", "even") %>">
             	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
             		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
-            		<td align="center"><%= issue.tracker.name %> <%= "(#{issue.project.name})" unless @project && @project == issue.project %></td>
+            		<td align="center"><%= issue.tracker.name %></td>
             		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
             		<td align="center"><%= issue.priority.name %></td>
-            		<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
+            		<td><%= "#{issue.project.name} - " unless @project && @project == issue.project %><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages