jro_apps/redmine Commit - r6212:7f77744e86e0

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

Jean-Philippe Lang -

r6212:7f77744e86e0

parent child

Context file:

r6212:7f77744e86e0

app/models/query.rb +8 -1

                    # "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+)$/

app/views/my/blocks/_issuesassignedtome.rhtml +2 -2

-             <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") %>

test/unit/query_test.rb +18 0

                  find_issues_with_query(query)
                end
+               def test_filter_assigned_to_me
+                 user = User.find(2)
+                 group = Group.find(10)
+                 User.current = user
+                 i1 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => user)
+                 i2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => group)
+                 i3 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => Group.find(11))
+                 group.users << user
+                 query = Query.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
+                 result = query.issues
+                 assert_equal Issue.visible.all(:conditions => {:assigned_to_id => ([2] + user.reload.group_ids)}).sort_by(&:id), result.sort_by(&:id)
+                 assert result.include?(i1)
+                 assert result.include?(i2)
+                 assert !result.include?(i3)
+               end
                def test_filter_watched_issues
                  User.current = User.find(1)
                  query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages