From 8a14bf05f8d805f5976dc9adab9464601af5c5e8 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Mon, 9 Nov 2015 18:59:04 +0200 Subject: [PATCH] Story #104525314 - EPP user must respect serverDeleteProhibited --- app/models/epp/domain.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 9a9e51b4e..a0b75500a 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -776,12 +776,12 @@ class Epp::Domain < Domain ### ABILITIES ### - # depricated -- this is redundant TODO: try to remove + def can_be_deleted? begin errors.add(:base, :domain_status_prohibits_operation) return false - end if statuses.include?(DomainStatus::CLIENT_DELETE_PROHIBITED) + end if (statuses & [DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED].any? true end