From 8013701580eb0a610802121b1afb3765c0b75590 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 15 Feb 2016 15:42:12 +0200 Subject: [PATCH] 109818884-rule_added_to_others --- app/models/domain.rb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index a816d5601..beee1d125 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -704,19 +704,6 @@ 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 + 1.day - self.outzone_at = self.valid_to + 15.day - else - self.outzone_at = nil - end - end - # check for deleted status statuses.each do |s| unless update.include? s @@ -725,8 +712,10 @@ class Domain < ActiveRecord::Base 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 + when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set + self.outzone_at = self.valid_to + 15.day + when DomainStatus::DomainStatus::SERVER_HOLD # removal causes server hold to set + self.outzone_at = nil end end end