From 9067d0048cd837ca17824bd67bb4b0a60c8a7565 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 10 Aug 2015 12:32:59 +0300 Subject: [PATCH] No pending update when force update #2623 --- app/models/domain.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 603cd3755..edc129ee8 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -574,7 +574,7 @@ class Domain < ActiveRecord::Base end def pending_update? - statuses.include?(DomainStatus::PENDING_UPDATE) + statuses.include?(DomainStatus::PENDING_UPDATE) && !statuses.include?(DomainStatus::FORCE_UPDATE) end # public api @@ -609,7 +609,7 @@ class Domain < ActiveRecord::Base end def pending_delete? - statuses.include?(DomainStatus::PENDING_DELETE) + statuses.include?(DomainStatus::PENDING_DELETE) && !statuses.include?(DomainStatus::FORCE_DELETE) end # TODO: Review the list and disallow epp calls