From 7f77744e86e0db306083a43a2da4b8ab508da7e1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 31 Jul 2011 10:22:36 +0000 Subject: 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 --- app/models/query.rb | 9 ++++++++- app/views/my/blocks/_issuesassignedtome.rhtml | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'app') 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+)$/ diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml index 0666a473b..28267d69a 100644 --- a/app/views/my/blocks/_issuesassignedtome.rhtml +++ b/app/views/my/blocks/_issuesassignedtome.rhtml @@ -1,7 +1,7 @@ -

<%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => User.current.id})%>)

+

<%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)

<% 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") %> -- cgit v1.2.3