From a75d8c840716632a4eeba329e982a216bd788ae1 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 31 Mar 2016 17:51:40 +0300 Subject: [PATCH 01/14] 116209751-option_added --- app/models/depp/domain.rb | 11 +++++++++++ app/views/registrar/domains/delete.haml | 5 +++++ .../registrar/domains/form_partials/_general.haml | 5 +++++ config/locales/en.yml | 2 ++ 4 files changed, 23 insertions(+) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 7b4630008..03ee83592 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -187,6 +187,12 @@ module Depp } end + if domain_params[:verified].present? + custom_params[:_anonymus] << { + chg: { registrant_verified: 'yes' } + } + end + if domain_params[:reserved_pw].present? custom_params[:_anonymus] << { reserved: { pw: { value: domain_params[:reserved_pw] } } } end @@ -217,6 +223,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? diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index 13953a6e3..5216622fb 100644 --- a/app/views/registrar/domains/delete.haml +++ b/app/views/registrar/domains/delete.haml @@ -7,6 +7,11 @@ = t(:legal_document) .panel-body .form-group + .col-md-3.control-label + = label_tag :verified, t(:verified) + .col-md-7 + = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + .col-md-4.control-label = label_tag 'domain[legal_document]', t(:legal_document), class: 'required' %p.help-block= t(:legal_document_max_size) diff --git a/app/views/registrar/domains/form_partials/_general.haml b/app/views/registrar/domains/form_partials/_general.haml index e4c124803..51f855f4e 100644 --- a/app/views/registrar/domains/form_partials/_general.haml +++ b/app/views/registrar/domains/form_partials/_general.haml @@ -23,6 +23,11 @@ = text_field_tag 'domain[registrant]', @domain_params[:registrant], class: "hidden" = text_field_tag 'domain[registrant_helper]', contacts.find_by(code: @domain_params[:registrant]).try(:search_name), class: 'form-control', data: {autocomplete: search_contacts_registrar_domains_path}, required: true + .form-group + .col-md-3.control-label + = label_tag :verified, t(:verified) + .col-md-7 + = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" - unless params[:domain_name] .form-group diff --git a/config/locales/en.yml b/config/locales/en.yml index 6b9a7af3c..ffa18216d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -941,3 +941,5 @@ en: edit_pw: 'Edit Pw' optional: 'Optional' test_registrar: "Test registrar" + verified_confirm: 'Verified status is for cases when current registrant is the one applying for the update. Legal document signed by the registrant is required. Are you sure this update is properly verified with the registrant?' + verified: 'Verified' From 442b2b5a714633fff08c53182b7944e687536249 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 5 Apr 2016 14:52:27 +0300 Subject: [PATCH 02/14] 116209751-css_modification --- app/views/registrar/domains/delete.haml | 5 +++-- .../registrar/domains/form_partials/_general.haml | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index 5216622fb..706587629 100644 --- a/app/views/registrar/domains/delete.haml +++ b/app/views/registrar/domains/delete.haml @@ -7,11 +7,12 @@ = t(:legal_document) .panel-body .form-group - .col-md-3.control-label + .col-md-4.control-label = label_tag :verified, t(:verified) - .col-md-7 + .col-md-6 = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + .form-group .col-md-4.control-label = label_tag 'domain[legal_document]', t(:legal_document), class: 'required' %p.help-block= t(:legal_document_max_size) diff --git a/app/views/registrar/domains/form_partials/_general.haml b/app/views/registrar/domains/form_partials/_general.haml index 51f855f4e..a41e6cd2b 100644 --- a/app/views/registrar/domains/form_partials/_general.haml +++ b/app/views/registrar/domains/form_partials/_general.haml @@ -23,11 +23,13 @@ = text_field_tag 'domain[registrant]', @domain_params[:registrant], class: "hidden" = text_field_tag 'domain[registrant_helper]', contacts.find_by(code: @domain_params[:registrant]).try(:search_name), class: 'form-control', data: {autocomplete: search_contacts_registrar_domains_path}, required: true - .form-group - .col-md-3.control-label - = label_tag :verified, t(:verified) - .col-md-7 - = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + + - if params[:domain_name] + .form-group + .col-md-3.control-label + = label_tag :verified, t(:verified) + .col-md-7 + = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" - unless params[:domain_name] .form-group From 55af3c8326e8a0eec0ead67313303f6f27cea7df Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 8 Apr 2016 15:54:46 +0300 Subject: [PATCH 03/14] 116209751-params_change --- app/models/depp/domain.rb | 7 +------ app/views/registrar/domains/form_partials/_general.haml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 03ee83592..05fd2fef9 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -189,7 +189,7 @@ module Depp if domain_params[:verified].present? custom_params[:_anonymus] << { - chg: { registrant_verified: 'yes' } + registrant_verified: { value: 'yes' } } end @@ -223,11 +223,6 @@ 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? diff --git a/app/views/registrar/domains/form_partials/_general.haml b/app/views/registrar/domains/form_partials/_general.haml index a41e6cd2b..91ae7462f 100644 --- a/app/views/registrar/domains/form_partials/_general.haml +++ b/app/views/registrar/domains/form_partials/_general.haml @@ -29,7 +29,7 @@ .col-md-3.control-label = label_tag :verified, t(:verified) .col-md-7 - = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + = check_box_tag 'domain[verified]', '1', @domain_params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" - unless params[:domain_name] .form-group From 0696700e5d8fc86cf8a22dd3c17453476a300598 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 12 Apr 2016 22:32:32 +0300 Subject: [PATCH 04/14] 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 05/14] 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 06/14] 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 07/14] 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 From dd0886f3075648265cd231882855040b51cb00d8 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 19 Apr 2016 11:04:07 +0300 Subject: [PATCH 08/14] 116209751-gemlock_update --- Gemfile.lock | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index dbc1e8e3c..d2a5dd926 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,15 @@ GIT data_migrate (1.3.0) rails (>= 4.1.0) +GIT + remote: https://github.com/internetee/epp-xml.git + revision: 287fe8705ca2f344ea670b922dd9f08635efc7af + ref: 287fe8705ca2f344ea670b922dd9f08635efc7af + specs: + epp-xml (1.0.4) + activesupport (~> 4.1) + builder (~> 3.2) + GIT remote: https://github.com/internetee/epp.git revision: 505c3f2739eb1da918e54111aecfb138a822739d From 8b49c3882033636a7653419116eda27f730ee5a3 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 19 Apr 2016 11:20:04 +0300 Subject: [PATCH 09/14] 116209751-gemfile.lock --- Gemfile.lock | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2a5dd926..591643057 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,9 +200,6 @@ GEM docile (1.1.5) domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) - epp-xml (1.0.4) - activesupport (~> 4.1) - builder (~> 3.2) equalizer (0.0.11) erubis (2.7.0) execjs (2.6.0) @@ -598,7 +595,7 @@ DEPENDENCIES devise (= 3.5.4) digidoc_client (= 0.2.1) epp (= 1.4.2)! - epp-xml (= 1.0.4) + epp-xml (= 1.0.4)! fabrication (= 2.13.2) faker (= 1.4.3) figaro (= 1.1.1) From 6a49099b5282b8a2de5df6d7d3b2c3defba465c7 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 22 Apr 2016 15:13:16 +0300 Subject: [PATCH 10/14] 116209751-template_fix --- app/views/registrar/domains/delete.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index 706587629..f90f8ce04 100644 --- a/app/views/registrar/domains/delete.haml +++ b/app/views/registrar/domains/delete.haml @@ -8,9 +8,9 @@ .panel-body .form-group .col-md-4.control-label - = label_tag :verified, t(:verified) + = label_tag 'domain[verified]', t(:verified) .col-md-6 - = check_box_tag :verified, '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + = check_box_tag 'domain[verified]', '1', domain[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" .form-group .col-md-4.control-label From 7e1ad772585f8129308167edec766ef6f6419a73 Mon Sep 17 00:00:00 2001 From: Stas Date: Sun, 24 Apr 2016 16:26:16 +0300 Subject: [PATCH 11/14] 116209751-ref_to_another_commit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f6dc77b0f..d9ad7593a 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ gem 'digidoc_client', '0.2.1' gem 'epp', '1.4.2', github: 'internetee/epp' gem 'epp-xml', '1.0.4', github: 'internetee/epp-xml', - ref: '287fe8705ca2f344ea670b922dd9f08635efc7af' # EIS EPP XMLs + ref: '009611d78a3bebab33c04f73968f4606863f4b93' # EIS EPP XMLs gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem) # que diff --git a/Gemfile.lock b/Gemfile.lock index 591643057..c4ace1088 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/internetee/epp-xml.git - revision: 287fe8705ca2f344ea670b922dd9f08635efc7af - ref: 287fe8705ca2f344ea670b922dd9f08635efc7af + revision: 009611d78a3bebab33c04f73968f4606863f4b93 + ref: 009611d78a3bebab33c04f73968f4606863f4b93 specs: epp-xml (1.0.4) activesupport (~> 4.1) From 5025758bc1b96954425f80c2ef1feaef42204824 Mon Sep 17 00:00:00 2001 From: Stas Date: Sun, 24 Apr 2016 16:49:59 +0300 Subject: [PATCH 12/14] 116209751-typo --- app/views/registrar/domains/delete.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index f90f8ce04..ab1bdfa31 100644 --- a/app/views/registrar/domains/delete.haml +++ b/app/views/registrar/domains/delete.haml @@ -10,7 +10,7 @@ .col-md-4.control-label = label_tag 'domain[verified]', t(:verified) .col-md-6 - = check_box_tag 'domain[verified]', '1', domain[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" + = check_box_tag 'domain[verified]', '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);" .form-group .col-md-4.control-label From ce297dacd6e6fd037c73672cfad84b93fcf308a2 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 10 May 2016 15:18:20 +0300 Subject: [PATCH 13/14] 116209751-dublicate_deleted --- app/models/depp/domain.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index 997a6b693..f181d0000 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -214,10 +214,6 @@ module Depp rem_arr << { ns: rem_ns } if rem_ns.any? rem_arr << { _anonymus: rem_anon } if rem_anon.any? - if domain_params[:registrant] != old_domain_params[:registrant] - chg = [{ registrant: { value: domain_params[:registrant] } }] - end - 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] From 01f8aa1e68671109ca1fe793d627cb4b38a8cdfc Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 18 May 2016 18:18:08 +0300 Subject: [PATCH 14/14] 116209751-updated_gem_ref --- Gemfile | 4 +--- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index d9ad7593a..d990fa2cb 100644 --- a/Gemfile +++ b/Gemfile @@ -88,9 +88,7 @@ gem 'digidoc_client', '0.2.1' # epp gem 'epp', '1.4.2', github: 'internetee/epp' -gem 'epp-xml', '1.0.4', - github: 'internetee/epp-xml', - ref: '009611d78a3bebab33c04f73968f4606863f4b93' # EIS EPP XMLs +gem 'epp-xml', '1.0.5', github: 'internetee/epp-xml' # EIS EPP XMLs gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem) # que diff --git a/Gemfile.lock b/Gemfile.lock index c4ace1088..577bbbf20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,10 +18,9 @@ GIT GIT remote: https://github.com/internetee/epp-xml.git - revision: 009611d78a3bebab33c04f73968f4606863f4b93 - ref: 009611d78a3bebab33c04f73968f4606863f4b93 + revision: 475f650951f2cf5015e00d48f408a2194ecc1662 specs: - epp-xml (1.0.4) + epp-xml (1.0.5) activesupport (~> 4.1) builder (~> 3.2) @@ -595,7 +594,7 @@ DEPENDENCIES devise (= 3.5.4) digidoc_client (= 0.2.1) epp (= 1.4.2)! - epp-xml (= 1.0.4)! + epp-xml (= 1.0.5)! fabrication (= 2.13.2) faker (= 1.4.3) figaro (= 1.1.1)