Include issues asigned to user's groups when using "assigned to me" filter (#2964).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6332 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2011-07-31 10:22:36 +00:00
parent 8ba74845bc
commit 7f77744e86
3 changed files with 28 additions and 3 deletions
+8 -1
View File
@@ -487,7 +487,14 @@ class Query < ActiveRecord::Base
# "me" value subsitution
if %w(assigned_to_id author_id watcher_id).include?(field)
v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
if v.delete("me")
if User.current.logged?
v.push(User.current.id.to_s)
v += User.current.group_ids.map(&:to_s) if field == 'assigned_to_id'
else
v.push("0")
end
end
end
if field =~ /^cf_(\d+)$/
@@ -1,7 +1,7 @@
<h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => User.current.id})%>)</h3>
<h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)</h3>
<% assigned_issues = Issue.visible.open.find(:all,
:conditions => {:assigned_to_id => User.current.id},
:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)},
:limit => 10,
:include => [ :status, :project, :tracker, :priority ],
:order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %>