diff --git a/app/models/domain.rb b/app/models/domain.rb index 138afa66e..d0f8d6260 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -408,8 +408,7 @@ class Domain < ActiveRecord::Base end end - return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::SERVER_RENEW_PROHIBITED, - DomainStatus::CLIENT_RENEW_PROHIBITED, DomainStatus::PENDING_RENEW, + return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::PENDING_RENEW, DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_DELETE, DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION) true diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 15e16163a..3f32ce6d5 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -8,7 +8,7 @@ class Epp::Domain < Domain before_validation :manage_permissions def manage_permissions return if is_admin # this bad hack for 109086524, refactor later - return true if is_transfer + return true if is_transfer || is_renewal return unless update_prohibited? || delete_prohibited? add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation)) false @@ -590,6 +590,7 @@ class Epp::Domain < Domain statuses.delete(DomainStatus::SERVER_HOLD) statuses.delete(DomainStatus::EXPIRED) + statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED) save end