diff --git a/app/models/domain.rb b/app/models/domain.rb index 9ed9afde4..0d7fb4c56 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -570,9 +570,12 @@ class Domain < ActiveRecord::Base statuses << DomainStatus::SERVER_RENEW_PROHIBITED statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED statuses << DomainStatus::SERVER_UPDATE_PROHIBITED - statuses << DomainStatus::SERVER_MANUAL_INZONE 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 save(validate: false) end diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 6aad6246d..d2c7c8d4e 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -253,7 +253,6 @@ describe Domain do "forceDelete", "pendingDelete", "serverHold", - "serverManualInzone", "serverRenewProhibited", "serverTransferProhibited", "serverUpdateProhibited"