"Author" column replaced by "Assigned to" in issue list.

"Assigned to" column added in the csv export.

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

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index bbbfa4267391d0e9366dd5dc31dd484cafa614c3..80855889a07dd9d8efeec3b17d3654247591e681 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -262,7 +262,7 @@ class ProjectsController < ApplicationController
       @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)             
       @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']                                                               
       @issues = Issue.find :all, :order => sort_clause,
-                                               :include => [ :author, :status, :tracker, :project, :priority ],
+                                               :include => [ :assigned_to, :status, :tracker, :project, :priority ],
                                                :conditions => @query.statement,
                                                :limit  =>  @issue_pages.items_per_page,
                                                :offset =>  @issue_pages.current.offset                                         
@@ -280,7 +280,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 => :custom_field} ],
+                                               :include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
                                                :conditions => @query.statement,
                                                :limit => Setting.issues_export_limit
 
@@ -292,6 +292,7 @@ class ProjectsController < ApplicationController
                        l(:field_tracker),
                        l(:field_priority),
                        l(:field_subject),
+                       l(:field_assigned_to),
                        l(:field_author),
                        l(:field_start_date),
                        l(:field_due_date),
@@ -309,7 +310,8 @@ class ProjectsController < ApplicationController
                             issue.tracker.name, 
                             issue.priority.name,
                             issue.subject, 
-                            issue.author.display_name,
+                            (issue.assigned_to ? issue.assigned_to.name : ""),
+                            issue.author.name,
                             issue.start_date ? l_date(issue.start_date) : nil,
                             issue.due_date ? l_date(issue.due_date) : nil,
                             issue.done_ratio,

diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index 7de1b144872256ecc544f08cef308826c5b2f72c..3f650ea5ef1c921551a1774e5e36f80d12db642c 100644 (file)
--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -51,7 +51,7 @@
                <%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %>
                <%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %>
                <th><%=l(:field_subject)%></th>
-               <%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_author)) %>
+               <%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %>
                <%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %>
        </tr></thead>
        <tbody>
@@ -63,7 +63,7 @@
                <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 align="center"><%= issue.author.display_name %></td>
+               <td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
                <td align="center"><%= format_time(issue.updated_on) %></td>
        </tr>
        <% end %>