##// END OF EJS Templates
Code cleanup....
Jean-Philippe Lang -
r10154:972a991a922e
parent child
Show More
@@ -334,15 +334,15 class Mailer < ActionMailer::Base
334 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
334 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
335 user_ids = options[:users]
335 user_ids = options[:users]
336
336
337 scope = Issue.open.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" +
337 scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +
338 " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
338 " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
339 " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date]
339 " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date
340 )
340 )
341 scope = scope.scoped(:conditions => {:assigned_to_id => user_ids}) if user_ids.present?
341 scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?
342 scope = scope.scoped(:conditions => {:project_id => project.id}) if project
342 scope = scope.where(:project_id => project.id) if project
343 scope = scope.scoped(:conditions => {:tracker_id => tracker.id}) if tracker
343 scope = scope.where(:tracker_id => tracker.id) if tracker
344
344
345 issues_by_assignee = scope.all(:include => [:status, :assigned_to, :project, :tracker]).group_by(&:assigned_to)
345 issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).all.group_by(&:assigned_to)
346 issues_by_assignee.keys.each do |assignee|
346 issues_by_assignee.keys.each do |assignee|
347 if assignee.is_a?(Group)
347 if assignee.is_a?(Group)
348 assignee.users.each do |user|
348 assignee.users.each do |user|
General Comments 0
You need to be logged in to leave comments. Login now