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

Merge remote-tracking branch 'origin/registry-791' into registry-791

Browse source
This commit is contained in:
Artur Beljajev 2018-06-15 16:56:27 +03:00
commit 96b02ed8d5
4 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/concerns/domain/force_delete.rb
View file

@ -11,6 +11,7 @@ module Concerns::Domain::ForceDelete
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
.beginning_of_day
stop_all_pending_actions
allow_deletion
save(validate: false)
end
@ -26,8 +27,6 @@ module Concerns::Domain::ForceDelete
private
def stop_all_pending_actions
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_TRANSFER)
statuses.delete(DomainStatus::PENDING_RENEW)
@ -63,4 +62,9 @@ module Concerns::Domain::ForceDelete
statuses.delete(DomainStatus::PENDING_DELETE)
statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
end
def allow_deletion
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
end
end

1
app/models/domain.rb
View file

@ -617,6 +617,7 @@ class Domain < ActiveRecord::Base
hash = super
hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
hash['valid_from'] = hash['registered_at'] # API v1 requirement
hash.delete('statuses_before_force_delete')
hash
end