From 6b290a38fa364e0b603036e9a8bdade532eabf6d Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 21 May 2021 19:30:26 +0200 Subject: [PATCH] suite --- app/controllers/admin/newsletters_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/newsletters_controller.rb b/app/controllers/admin/newsletters_controller.rb index fab3c6a..50fa359 100755 --- a/app/controllers/admin/newsletters_controller.rb +++ b/app/controllers/admin/newsletters_controller.rb @@ -133,7 +133,7 @@ end @archive_newsletter = ArchiveNewsletter.create :newsletter_id => @newsletter.id, :title => @newsletter.title, :content => @newsletter.content, :email_from => Newsletter::EMAIL_TEXTES[@newsletter.email_from][0].to_s+ " <#{@newsletter.email_from}>" if params[:confirmed_groups] - PeopleNewsgroup.all(:conditions => {:newsgroup_id => params[:confirmed_groups]}).each do |pn| + PeopleNewsgroup.where(:newsgroup_id => params[:confirmed_groups]).all.each do |pn| if pn.person p =pn.person @@ -145,9 +145,9 @@ end - @sheets = Sheet.find(:all, :conditions => {:id => params[:confirmed_sheets]}) + @sheets = Sheet.where(:id => params[:confirmed_sheets]).all - @persons = Person.find(:all, :conditions => {:sheet_id => params[:confirmed_sheets], :newsletter => true}) + @persons = Person.where(:sheet_id => params[:confirmed_sheets], :newsletter => true).all @persons.each do |p| send_helper(@newsletter, p.email, :person => p, :sheet => p.sheet)