diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-23 18:18:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-23 18:18:13 +0000 |
| commit | 578fdc62f26c23951b2d2c2b9be0040c7ade0634 (patch) | |
| tree | 7f78426f78bdc325cae50368cc1bc3e23f4c5eaa /app/controllers | |
| parent | e1832f25c9aa16f1a95434adc209ee937110228a (diff) | |
| download | redmine-578fdc62f26c23951b2d2c2b9be0040c7ade0634.tar.gz redmine-578fdc62f26c23951b2d2c2b9be0040c7ade0634.zip | |
Ability to assign issues to groups (#2964).
Option is disabled by default. It can be turned on in application settings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6306 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/reports_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 0d4715078..1b5d2ccbc 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -24,8 +24,8 @@ class ReportsController < ApplicationController @versions = @project.shared_versions.sort @priorities = IssuePriority.all @categories = @project.issue_categories - @assignees = @project.members.collect { |m| m.user }.sort - @authors = @project.members.collect { |m| m.user }.sort + @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort + @authors = @project.users.sort @subprojects = @project.descendants.visible @issues_by_tracker = Issue.by_tracker(@project) @@ -63,12 +63,12 @@ class ReportsController < ApplicationController @report_title = l(:field_category) when "assigned_to" @field = "assigned_to_id" - @rows = @project.members.collect { |m| m.user }.sort + @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort @data = Issue.by_assigned_to(@project) @report_title = l(:field_assigned_to) when "author" @field = "author_id" - @rows = @project.members.collect { |m| m.user }.sort + @rows = @project.users.sort @data = Issue.by_author(@project) @report_title = l(:field_author) when "subproject" |