Fixed up some things with mailer - now working again

djcp · Jul 3, 2009 · c205c21 · c205c21
1 parent b1eeeae
commit c205c21
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/models/freemailer_campaign.rb b/app/models/freemailer_campaign.rb
@@ -32,7 +32,7 @@ def preview
     fill_template(preview_user)
   end
 
-  def send
+  def send_campaign
     if not sent
       contacts.each do |contact|
         begin
@@ -43,7 +43,6 @@ def send
       end
     end
   end
-  private
 
   def preview_user
     {
@@ -70,11 +69,13 @@ def fill_template_for_contact(person)
 
   def fill_template(user_hash)
     user_hash.default = ''
-    body_template.gsub(/\{(.*)\}/) do |item|
+    body_template.gsub(/\[\[(.*)\]\]/) do |item|
       user_hash[$1].to_s
     end
   end
 
+  private
+
   def remove_active_campaign
     debugger
     if sender.active_campaign == self