From ba1b4dbf25f735d610509a269f2d602d907d4816 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 11 Apr 2016 15:56:26 +0300 Subject: [PATCH 1/2] 117131083-force_delete_at_calculation --- app/models/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index dbdbe2d42..b4cadb106 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -575,7 +575,7 @@ class Domain < ActiveRecord::Base statuses << DomainStatus::SERVER_MANUAL_INZONE end - self.force_delete_at = (Time.zone.now + 31.days).beginning_of_day unless force_delete_at + self.force_delete_at = (Time.zone.now + Setting.redemption_grace_period.days + 1.day).beginning_of_day unless force_delete_at transaction do save!(validate: false) registrar.messages.create!( From 178818288d1ce7f43b6592102971e82d632c34eb Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 11 Apr 2016 16:02:42 +0300 Subject: [PATCH 2/2] 117131083-force_delete_at_calculation --- app/models/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index b4cadb106..125fa5c75 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -575,7 +575,7 @@ class Domain < ActiveRecord::Base statuses << DomainStatus::SERVER_MANUAL_INZONE end - self.force_delete_at = (Time.zone.now + Setting.redemption_grace_period.days + 1.day).beginning_of_day unless force_delete_at + self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day unless force_delete_at transaction do save!(validate: false) registrar.messages.create!(