From 1aa41257c5603ba1afc46cc9065688c8553aecda Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Mon, 26 Oct 2015 17:42:45 +0200 Subject: [PATCH] Story: 105754008 Setting domain from queue that it's valid --- app/jobs/domain_update_confirm_job.rb | 4 +++- app/models/epp/domain.rb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index c668307a6..b63b70d88 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -6,7 +6,9 @@ class DomainUpdateConfirmJob < Que::Job case action when RegistrantVerification::CONFIRMED domain.poll_message!(:poll_pending_update_confirmed_by_registrant) - domain.apply_pending_update! + domain.apply_pending_update! do |e| + e.instance_variable_set("@changed_attributes", e.changed_attributes.merge("statuses"=>[])) + end domain.clean_pendings! when RegistrantVerification::REJECTED DomainMailer.pending_update_rejected_notification_for_new_registrant(domain).deliver_now diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index c8ceef2dc..f28b76767 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -456,6 +456,7 @@ class Epp::Domain < Domain user = ApiUser.find(pending_json['current_user_id']) frame = Nokogiri::XML(pending_json['frame']) statuses.delete(DomainStatus::PENDING_UPDATE) + yield(self) if block_given? # need to skip statuses check here return unless update(frame, user, false) clean_pendings!