diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-31 10:22:36 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-31 10:22:36 +0000 |
commit | 7f77744e86e0db306083a43a2da4b8ab508da7e1 (patch) | |
tree | 6a49eb549ba9991221f1ccaf07fd029ffca0173c /app/models/query.rb | |
parent | 8ba74845bc9f959fe05e17c559d572c0ec1dbaff (diff) | |
download | redmine-7f77744e86e0db306083a43a2da4b8ab508da7e1.tar.gz redmine-7f77744e86e0db306083a43a2da4b8ab508da7e1.zip |
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
Diffstat (limited to 'app/models/query.rb')
-rw-r--r-- | app/models/query.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index ad6a65eb5..7aadce60c 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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+)$/ |