From a9c805f2cea3f9555924d8c6f05330f46e6219fc Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Fri, 30 Oct 2015 18:35:45 +0200 Subject: [PATCH] Story #104525314 - in some cases treat pendingDeleteConfirmation as pendingDelete no(renew, update, tranfer) pending allowed" --- app/models/domain.rb | 3 ++- app/models/epp/domain.rb | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 5d70df9fb..36ad4213c 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -659,7 +659,7 @@ class Domain < ActiveRecord::Base statuses.include?(DomainStatus::PENDING_UPDATE) && !statuses.include?(DomainStatus::FORCE_DELETE) end - # public api + # depricated not used, not valid def update_prohibited? pending_update_prohibited? && pending_delete_prohibited? end @@ -671,6 +671,7 @@ class Domain < ActiveRecord::Base def pending_update_prohibited? (statuses_was & [ + DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::CLIENT_UPDATE_PROHIBITED, DomainStatus::SERVER_UPDATE_PROHIBITED, DomainStatus::PENDING_CREATE, diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 0de548255..2aabbc9f6 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -773,6 +773,8 @@ class Epp::Domain < Domain end ### ABILITIES ### + + # depricated -- this is redundant TODO: try to remove def can_be_deleted? begin errors.add(:base, :domain_status_prohibits_operation) @@ -784,6 +786,7 @@ class Epp::Domain < Domain def transferrable? (statuses & [ + DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::PENDING_CREATE, DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE,