From 0696700e5d8fc86cf8a22dd3c17453476a300598 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 12 Apr 2016 22:32:32 +0300 Subject: [PATCH 1/4] 116209751-modification_for_update --- app/models/depp/domain.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 05fd2fef9..c4889b062 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -187,12 +187,6 @@ module Depp } end - if domain_params[:verified].present? - custom_params[:_anonymus] << { - registrant_verified: { value: 'yes' } - } - end - if domain_params[:reserved_pw].present? custom_params[:_anonymus] << { reserved: { pw: { value: domain_params[:reserved_pw] } } } end @@ -223,6 +217,11 @@ module Depp chg = [{ registrant: { value: domain_params[:registrant] } }] end + if domain_params[:verified].present? + chg.push({ registrant_verified: 'yes'}) if chg.present? + chg = [{ registrant_verified: 'yes'}] if chg.nil? + end + add_arr = nil if add_arr.none? rem_arr = nil if rem_arr.none? From cef53f16d887e07b71cb53733db149e102fcad50 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 13 Apr 2016 15:14:47 +0300 Subject: [PATCH 2/4] 116209751-value_change --- app/models/depp/domain.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index c4889b062..afaff73fe 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -217,9 +217,9 @@ module Depp chg = [{ registrant: { value: domain_params[:registrant] } }] end - if domain_params[:verified].present? - chg.push({ registrant_verified: 'yes'}) if chg.present? - chg = [{ registrant_verified: 'yes'}] if chg.nil? + if domain_params[:registrant] != old_domain_params[:registrant] + chg = [{ registrant: { value: domain_params[:registrant] } }] if !domain_params[:verified].present? + chg = [{ registrant: { value: domain_params[:registrant], attrs: { verified: 'yes' } } }] if domain_params[:verified] end add_arr = nil if add_arr.none? From c87907c56a0af239c4ad25040be465d650de2de4 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 15 Apr 2016 14:29:57 +0300 Subject: [PATCH 3/4] 116209751-param_added --- app/models/depp/domain.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index afaff73fe..997a6b693 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -66,8 +66,9 @@ module Depp def delete(domain_params) xml = epp_xml.delete({ - name: { value: domain_params[:name] } - }, Depp::Domain.construct_custom_params_hash(domain_params)) + name: { value: domain_params[:name] }}, + Depp::Domain.construct_custom_params_hash(domain_params), + (domain_params[:verified].present? && 'yes')) current_user.request(xml) end From efbadd10c0fab5f85efc73280101a12ba15b26e5 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 18 Apr 2016 18:09:24 +0300 Subject: [PATCH 4/4] 116209751-gemfile_modification --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d616cb534..f6dc77b0f 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,9 @@ gem 'digidoc_client', '0.2.1' # epp gem 'epp', '1.4.2', github: 'internetee/epp' -gem 'epp-xml', '1.0.4' # EIS EPP XMLs +gem 'epp-xml', '1.0.4', + github: 'internetee/epp-xml', + ref: '287fe8705ca2f344ea670b922dd9f08635efc7af' # EIS EPP XMLs gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem) # que