1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00

Include members of subprojects into user filter lists

This commit is contained in:
Holger Just 2010-08-31 14:58:59 +02:00
parent 961bbc1669
commit 369717e625

View File

@ -185,7 +185,10 @@ class Query < ActiveRecord::Base
user_values = []
user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
if project
user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
user_values += User.active.all(
:include => :members,
:conditions => {"#{Member.table_name}.project_id" => project.self_and_descendants.visible}
).collect{|u| [u.name, u.id.to_s]}
else
project_ids = Project.all(:conditions => Project.visible_by(User.current)).collect(&:id)
if project_ids.any?