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

Story #104525314 - in some cases treat pendingDeleteConfirmation as pendingDelete no(renew, update, tranfer) pending allowed"

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 18:35:45 +02:00
parent 2104cf2f0a
commit a9c805f2ce
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/domain.rb
View file

@ -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,

3
app/models/epp/domain.rb
View file

@ -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,