diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-01-27 01:09:09 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-01-27 01:09:09 +0000 |
commit | ea8e5c74ec493669e315b85729615e06f853d002 (patch) | |
tree | 384a93fed87147b21957a8de26bf80a404e49ece /app/models/mailer.rb | |
parent | ca3d706f56b90958e3b451e7fda04eee52ca2c1e (diff) | |
download | redmine-ea8e5c74ec493669e315b85729615e06f853d002.tar.gz redmine-ea8e5c74ec493669e315b85729615e06f853d002.zip |
remove unneeded Relation#all from Mailer model
git-svn-id: http://svn.redmine.org/redmine/trunk@12723 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r-- | app/models/mailer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb index c6becfdd4..a7cdd4c2e 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -266,7 +266,7 @@ class Mailer < ActionMailer::Base # Mailer.account_activation_request(user).deliver => sends an email to all active administrators def account_activation_request(user) # Send the email to all active administrators - recipients = User.active.where(:admin => true).all.collect { |u| u.mail }.compact + recipients = User.active.where(:admin => true).collect { |u| u.mail }.compact @user = user @url = url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, @@ -330,8 +330,8 @@ class Mailer < ActionMailer::Base scope = scope.where(:assigned_to_id => user_ids) if user_ids.present? scope = scope.where(:project_id => project.id) if project scope = scope.where(:tracker_id => tracker.id) if tracker - - issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).all.group_by(&:assigned_to) + issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker). + group_by(&:assigned_to) issues_by_assignee.keys.each do |assignee| if assignee.is_a?(Group) assignee.users.each do |user| |