zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-26 04:28:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Do not set manualInZone on force delete when hold status exists #2870

Browse source
This commit is contained in:
Martin Lensment 2015-08-24 12:08:44 +03:00
parent f5c379ca72
commit fbd281007c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/domain.rb
View file

@ -570,9 +570,12 @@ class Domain < ActiveRecord::Base
statuses << DomainStatus::SERVER_RENEW_PROHIBITED statuses << DomainStatus::SERVER_RENEW_PROHIBITED
statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
statuses << DomainStatus::SERVER_UPDATE_PROHIBITED statuses << DomainStatus::SERVER_UPDATE_PROHIBITED
statuses << DomainStatus::SERVER_MANUAL_INZONE
statuses << DomainStatus::PENDING_DELETE statuses << DomainStatus::PENDING_DELETE
if (statuses & [DomainStatus::SERVER_HOLD, DomainStatus::CLIENT_HOLD]).empty?
statuses << DomainStatus::SERVER_MANUAL_INZONE
end
self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
save(validate: false) save(validate: false)
end end

1
spec/models/domain_spec.rb
View file

@ -253,7 +253,6 @@ describe Domain do
"forceDelete", "forceDelete",
"pendingDelete", "pendingDelete",
"serverHold", "serverHold",
"serverManualInzone",
"serverRenewProhibited", "serverRenewProhibited",
"serverTransferProhibited", "serverTransferProhibited",
"serverUpdateProhibited" "serverUpdateProhibited"