zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-01 16:53:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104525314-domain-object-states' into staging, fix typo

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 19:53:13 +02:00
commit c2ced9a7e7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/domain.rb
View file

@ -223,7 +223,7 @@ class Domain < ActiveRecord::Base
count = 0 count = 0
expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at) expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at)
expired_pending_domains.each do |domain| expired_pending_domains.each do |domain|
unless domain.pending_update? || domain.pending_delete? || pending_delete_confirmation? unless domain.pending_update? || domain.pending_delete? || domain.pending_delete_confirmation?
msg = "#{Time.zone.now.utc} - ISSUE: DOMAIN #{domain.id}: #{domain.name} IS IN EXPIRED PENDING LIST, " \ msg = "#{Time.zone.now.utc} - ISSUE: DOMAIN #{domain.id}: #{domain.name} IS IN EXPIRED PENDING LIST, " \
"but no pendingDelete/pendingUpdate state present!\n" "but no pendingDelete/pendingUpdate state present!\n"
STDOUT << msg unless Rails.env.test? STDOUT << msg unless Rails.env.test?
@ -233,7 +233,7 @@ class Domain < ActiveRecord::Base
if domain.pending_update? if domain.pending_update?
DomainMailer.pending_update_expired_notification_for_new_registrant(domain).deliver_now DomainMailer.pending_update_expired_notification_for_new_registrant(domain).deliver_now
end end
if domain.pending_delete? || pending_delete_confirmation? if domain.pending_delete? || domain.pending_delete_confirmation?
DomainMailer.pending_delete_expired_notification(domain).deliver_now DomainMailer.pending_delete_expired_notification(domain).deliver_now
end end
domain.clean_pendings! domain.clean_pendings!