From 790373996df1772d432f255c80cc456d9bbf5047 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 10 Sep 2010 14:27:36 -0300 Subject: [PATCH] Using proper ActiveRecord relationships --- app/models/environment_mailing.rb | 2 +- app/models/organization_mailing.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/environment_mailing.rb b/app/models/environment_mailing.rb index 329ab2d..91dad1d 100644 --- a/app/models/environment_mailing.rb +++ b/app/models/environment_mailing.rb @@ -1,7 +1,7 @@ class EnvironmentMailing < Mailing def recipient(offset=0) - Person.find(:first, :conditions => [ "environment_id = ?", source_id], :order => :id, :offset => offset) + source.people.first(:order => :id, :offset => offset) end def each_recipient diff --git a/app/models/organization_mailing.rb b/app/models/organization_mailing.rb index 63a0bcd..d4289e8 100644 --- a/app/models/organization_mailing.rb +++ b/app/models/organization_mailing.rb @@ -5,8 +5,7 @@ class OrganizationMailing < Mailing end def recipient(offset=0) - environment_id = source.environment_id - Person.find(:first, :conditions => ['environment_id = ? and role_assignments.resource_type = ? and role_assignments.resource_id = ?', environment_id, 'Profile', source.id], :include => :role_assignments, :order => "profiles.id", :offset => offset) + source.members.first(:order => :id, :offset => offset) end def each_recipient -- libgit2 0.21.2