Subproject name added in csv and pdf exports.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@496 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 0f68f8006ebebe787a19b06b275ea9d06691d90b..6d8c3863e55f4501c4c495e0454176dc4bd31e10 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -280,7 +280,7 @@ class ProjectsController < ApplicationController
     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
 
@@ -289,6 +289,7 @@ class ProjectsController < ApplicationController
     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),
@@ -307,9 +308,10 @@ class ProjectsController < ApplicationController
       # csv lines
       @issues.each do |issue|
         fields = [issue.id, issue.status.name, 
+                            issue.project.name,
                             issue.tracker.name, 
                             issue.priority.name,
-                            issue.subject, 
+                            issue.subject,
                             (issue.assigned_to ? issue.assigned_to.name : ""),
                             issue.author.name,
                             issue.start_date ? l_date(issue.start_date) : nil,
@@ -337,7 +339,7 @@ class ProjectsController < ApplicationController
     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
                                                                                        

diff --git a/app/views/projects/export_issues_pdf.rfpdf b/app/views/projects/export_issues_pdf.rfpdf
index dd63d3657958d561c79026055c5efd28ba274c64..d782c54b06a47eadee7fb825c3fe2eee63bb003b 100644 (file)
--- a/app/views/projects/export_issues_pdf.rfpdf
+++ b/app/views/projects/export_issues_pdf.rfpdf
@@ -41,7 +41,7 @@
                pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)\r
                pdf.Cell(40, row_height, issue.author.name, 0, 0, 'L', 1)\r
                pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)\r
-               pdf.MultiCell(0, row_height, issue.subject)\r
+               pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))\r
                pdf.Line(10, pdf.GetY, 287, pdf.GetY)\r
                pdf.SetY(pdf.GetY() + 1)\r
        end\r

diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index 8169e9753ad51c2836adbdfdd33fee4f50476348..60c72eb523425e5b87267994b54c70549e676281 100644 (file)
--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -59,10 +59,10 @@
        <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>