From 1bf7315a9186d215f89191d6464ed4e99b56636f Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 11 Mar 2016 14:19:48 +0200 Subject: [PATCH] Story#113525877 - Change state check from pendingDelete to pendingDeleteConfirmation --- app/controllers/registrant/domains_controller.rb | 4 ++-- app/views/registrant/domains/partials/_statuses.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb index 18c29abb0..fbd0eff13 100644 --- a/app/controllers/registrant/domains_controller.rb +++ b/app/controllers/registrant/domains_controller.rb @@ -22,7 +22,7 @@ class Registrant::DomainsController < RegistrantController def domain_verification_url authorize! :view, :registrant_domains dom = domains.find(params[:id]) - if (dom.statuses.include?(DomainStatus::PENDING_UPDATE) || dom.statuses.include?(DomainStatus::PENDING_DELETE)) && + if (dom.statuses.include?(DomainStatus::PENDING_UPDATE) || dom.statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)) && dom.pending_json.present? @domain = dom @@ -78,7 +78,7 @@ class Registrant::DomainsController < RegistrantController def get_confirm_path(statuses) if statuses.include?(DomainStatus::PENDING_UPDATE) "#{ENV['registrant_url']}/registrant/domain_update_confirms" - elsif statuses.include?(DomainStatus::PENDING_DELETE) + elsif statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION) "#{ENV['registrant_url']}/registrant/domain_delete_confirms" end end diff --git a/app/views/registrant/domains/partials/_statuses.haml b/app/views/registrant/domains/partials/_statuses.haml index 0aa5b1e6f..90a969324 100644 --- a/app/views/registrant/domains/partials/_statuses.haml +++ b/app/views/registrant/domains/partials/_statuses.haml @@ -11,7 +11,7 @@ - @domain.statuses.each do |status| %tr %td - - if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include?(status) && @domain.pending_json.present? + - if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION].include?(status) && @domain.pending_json.present? = link_to(status, domain_verification_url_registrant_domain_url(@domain.id)) - else = status