zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 18:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '109818884-server-hold-sets-force_delete_at' into staging

Browse source
This commit is contained in:
Stas 2016-02-15 15:42:47 +02:00
commit e5510ac81c
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/models/domain.rb
View file

@ -635,19 +635,6 @@ class Domain < ActiveRecord::Base
# special handling for admin changing status # special handling for admin changing status
def admin_status_update(update) 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 # check for deleted status
statuses.each do |s| statuses.each do |s|
unless update.include? s unless update.include? s
@ -656,8 +643,10 @@ class Domain < ActiveRecord::Base
self.delete_at = nil self.delete_at = nil
when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set
self.outzone_at = Time.zone.now if self.force_delete_at.present? self.outzone_at = Time.zone.now if self.force_delete_at.present?
# Handle any other special remove cases? when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set
# when DomainStatus::FORCE_DELETE unset_force_delete 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 end
end end