From 5a112dccb078b0ff742a217f4c14e9f80cdc436d Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 1 Dec 2015 14:46:43 +0200 Subject: [PATCH 1/2] fix clean_expired_pendings is class method, so it should call instance first --- app/models/domain.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 64b7ff5a6..cc35807d5 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -238,10 +238,10 @@ class Domain < ActiveRecord::Base end count += 1 if domain.pending_update? - DomainMailer.pending_update_expired_notification_for_new_registrant(id).deliver + DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver end if domain.pending_delete? || domain.pending_delete_confirmation? - DomainMailer.pending_delete_expired_notification(id, deliver_emails).deliver + DomainMailer.pending_delete_expired_notification(domain.id, deliver_emails).deliver end domain.clean_pendings! unless Rails.env.test? From a6100298f0341c3a3330dba4ee8a9e1e1f51576a Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 2 Dec 2015 12:25:20 +0200 Subject: [PATCH 2/2] Story#109317508 commented sending email to registrant em email change --- app/models/contact.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/contact.rb b/app/models/contact.rb index 7ebfaf684..f5a177eef 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -48,7 +48,7 @@ class Contact < ActiveRecord::Base return nil unless deliver_emails == true emails = [] emails << [email, email_was] - emails << domains.map(&:registrant_email) if domains.present? + # emails << domains.map(&:registrant_email) if domains.present? emails = emails.flatten.uniq emails.each do |e| ContactMailer.email_updated(email_was, e, id, deliver_emails).deliver