From 47dcca06babd76599ec491949863bd1e70ccf5f0 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Mon, 14 Dec 2015 14:40:01 +0200 Subject: [PATCH 1/2] Story #109818884 - set outzone_at when removing serverManualInZone --- app/models/domain.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/domain.rb b/app/models/domain.rb index 7858b3d36..57e4367b0 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -710,6 +710,8 @@ class Domain < ActiveRecord::Base case s when DomainStatus::PENDING_DELETE self.delete_at = nil + when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set + self.outzone_at = Time.zone.now if self.force_delete_at.present? # Handle any other special remove cases? # when DomainStatus::FORCE_DELETE unset_force_delete end From fe771af0aee0ad111abf11130024a892bfb6f72d Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 13 Jan 2016 18:32:35 +0200 Subject: [PATCH 2/2] 1098188884-outzone_clear --- app/models/domain.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/models/domain.rb b/app/models/domain.rb index 57e4367b0..0a223520a 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -704,6 +704,18 @@ class Domain < ActiveRecord::Base # special handling for admin changing status def admin_status_update(update) + #check for hold status + if self.statuses.include?( + DomainStatus::SERVER_HOLD) && + !update.include?(DomainStatus::SERVER_HOLD) + + if self.statuses.include?(DomainStatus::EXPIRED) + self.outzone_at = Time.zone.now + else + self.outzone_at = nil + end + end + # check for deleted status statuses.each do |s| unless update.include? s