From 30dffaac93c96edb5ba0100cbbdf62f5691d07f5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 27 Feb 2013 20:27:24 +0100 Subject: Don't send a PIN e-mail for a just created conference. --- app/models/conference.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/conference.rb') diff --git a/app/models/conference.rb b/app/models/conference.rb index 8c5a752..aee75d5 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -31,7 +31,7 @@ class Conference < ActiveRecord::Base validate :start_and_end_dates_must_make_sense, :if => Proc.new { |conference| !conference.start.blank? && !conference.end.blank? } - after_save :send_pin_email_when_pin_has_changed + before_save :send_pin_email_when_pin_has_changed default_scope where(:state => 'active').order(:start) @@ -55,7 +55,7 @@ class Conference < ActiveRecord::Base end def send_pin_email_when_pin_has_changed - if self.conferenceable.class == User && self.pin_changed? + if !self.new_record? && self.conferenceable.class == User && self.pin_changed? Notifications.new_pin(self).deliver end end -- cgit v1.2.3