From 9f1cf8f620416cb8ddaf9c523456ea3beadc1270 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 14 May 2021 12:41:49 +0300 Subject: [PATCH] limited delete prohibited opportunities --- app/models/concerns/domain/releasable.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/releasable.rb b/app/models/concerns/domain/releasable.rb index 27feece5c..b859b8102 100644 --- a/app/models/concerns/domain/releasable.rb +++ b/app/models/concerns/domain/releasable.rb @@ -4,7 +4,6 @@ module Domain::Releasable class_methods do def release_domains releasable_domains.each do |domain| - return if domain.statuses.include? 'serverReleaseProhibited' domain.release yield domain if block_given? @@ -19,14 +18,14 @@ module Domain::Releasable ' AND ? != ALL(coalesce(statuses, array[]::varchar[]))', Time.zone.today, Time.zone.today, - DomainStatus::SERVER_DELETE_PROHIBITED) + DomainStatus::SERVER_RELEASE_PROHIBITED) else where('(delete_date <= ? OR force_delete_date <= ?)' \ ' AND ? != ALL(coalesce(statuses, array[]::varchar[])) AND' \ ' ? != ALL(COALESCE(statuses, array[]::varchar[]))', Time.zone.today, Time.zone.today, - DomainStatus::SERVER_DELETE_PROHIBITED, + DomainStatus::SERVER_RELEASE_PROHIBITED, DomainStatus::DELETE_CANDIDATE) end end