From 93dfcbaa8ca9d5fcf84f8fd26d244ee553b6eada Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 27 Dec 2015 00:39:29 +0100 Subject: [PATCH] Quick correction, to only send orga's mails when a submitter has been filed --- app/models/orga.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/orga.rb b/app/models/orga.rb index 9768c80e..c6357680 100644 --- a/app/models/orga.rb +++ b/app/models/orga.rb @@ -18,16 +18,18 @@ class Orga < ActiveRecord::Base scope :unmoderated, -> { where moderated: false } before_validation do - self.secret ||= SecureRandom.urlsafe_base64(32)[0...32] if submitter + unless submitter.blank? + self.secret ||= SecureRandom.urlsafe_base64(32)[0...32] + end self.submission_time ||= Time.zone.now end after_create do - send_secret if submitter + send_secret unless submitter.blank? end after_update do - if submitter + unless submitter.blank? send_secret if secret_changed? if moderated_changed? @@ -39,7 +41,7 @@ class Orga < ActiveRecord::Base end before_destroy do - OrgaMailer.destroy(self).deliver_now! if submitter + OrgaMailer.destroy(self).deliver_now! unless submitter.blank? end def send_secret