diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-05 07:33:51 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-05 07:33:51 +0000 |
commit | 0ea1b712be79347a7002262f680bdffe05c2ecda (patch) | |
tree | e76878d34c344a2ce407b205d71fb4920fb869b1 /app/controllers/projects_controller.rb | |
parent | 9cf96580bf4b8cce342b1a675b84766d59ec7f3b (diff) | |
download | redmine-0ea1b712be79347a7002262f680bdffe05c2ecda.tar.gz redmine-0ea1b712be79347a7002262f680bdffe05c2ecda.zip |
"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
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r-- | app/controllers/projects_controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bbbfa4267..80855889a 100644 --- 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, |