Skip to content

O
OHR Support
Commit 0bcde4ab authored by Jean-Baptiste Barth's avatar Jean-Baptiste Barth
Browse files
Options

Fixed: assigned_to and author filters in cross project issues view should be… 

Fixed: assigned_to and author filters in cross project issues view should be based on user's project visibility. #5760

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3916 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 8a2bc577
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
app/models/query.rb
View file @ 0bcde4ab
......@@ -187,7 +187,7 @@ class Query < ActiveRecord::Base
if project
user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
else
project_ids = User.current.projects.collect(&:id)
project_ids = Project.all(:conditions => Project.visible_by(User.current)).collect(&:id)
if project_ids.any?
# members of the user's projects
user_values += User.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", project_ids]).sort.collect{|s| [s.name, s.id.to_s] }
......
test/unit/query_test.rb
View file @ 0bcde4ab
......@@ -351,4 +351,13 @@ class QueryTest < ActiveSupport::TestCase
assert !q.editable_by?(manager)
assert !q.editable_by?(developer)
end
context "#available_filters" do
should "include users of visible projects in cross-project view" do
query = Query.new(:name => "_")
users = query.available_filters["assigned_to_id"]
assert_not_nil users
assert users[:values].map{|u|u[1]}.include?("3")
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment