From 096c23f55e9a7ef292282d2703501b90336ff679 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 28 Apr 2016 15:09:51 +0300 Subject: [PATCH 1/9] 117806281-clickable_actions --- app/models/concerns/versions.rb | 7 +++++++ app/views/admin/domains/partials/_version.haml | 14 +++++++++++++- app/views/admin/domains/versions.haml | 6 +++--- config/locales/en.yml | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb index 49c4298f2..d15bd297e 100644 --- a/app/models/concerns/versions.rb +++ b/app/models/concerns/versions.rb @@ -47,6 +47,13 @@ module Versions user end + def get_request_by_uuid(uuid) + return unless uuid + ApiLog::EppLog.find_by(uuid: uuid).request + end + + + # callbacks def touch_domain_version domain.try(:touch_with_version) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 7cd9a497e..4f87efe0e 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -29,7 +29,10 @@ %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id]) %p.text-right - = event + - if (event == 'update' || event = 'create') && version + = link_to event, '#', class: 'js-event' + - else + = event %br = creator - if version @@ -115,6 +118,15 @@ = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do = domain.registrar.name + - if (event == 'create' || event == 'update') && version + %tr.js-event{ style: 'display: none;' } + %td{colspan: 8} + %pre + - if version.uuid + = Nokogiri::XML(Epp::ApiLog::EppLog.find_by(uuid: uuid).request) + - else + = t(:cant_match_version) + - if domain.pending_json.present? %tr.js-pending{ style: 'display: none;' } %td{colspan: 8} diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml index b803808aa..df5085e9b 100644 --- a/app/views/admin/domains/versions.haml +++ b/app/views/admin/domains/versions.haml @@ -37,9 +37,9 @@ domain: version.reify, version: version.previous :coffee - $(document).on 'click', '.js-pending-toggle', (e) -> + $(document).on 'click', '.js-pending-toggle, .js-event', (e) -> e.preventDefault() - $(document).on 'mousedown', '.js-pending-toggle', (e) -> + $(document).on 'mousedown', '.js-pending-toggle, .js-event', (e) -> target = $(e.target) - target.parents('tr').next('tr.js-pending').toggle() + target.parents('tr').next('tr.js-pending, tr.js-event').toggle() diff --git a/config/locales/en.yml b/config/locales/en.yml index faa4c4595..c4bc211c1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -941,3 +941,4 @@ en: add_blocked_domain: 'Add domain to blocked list' edit_pw: 'Edit Pw' optional: 'Optional' + cant_match_version: 'Impossible match version with request' From d66e5e3c96ccba60af73b103310e4e82ae84ebbd Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 28 Apr 2016 15:18:06 +0300 Subject: [PATCH 2/9] '117806281-method_delete --- app/models/concerns/versions.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb index d15bd297e..49c4298f2 100644 --- a/app/models/concerns/versions.rb +++ b/app/models/concerns/versions.rb @@ -47,13 +47,6 @@ module Versions user end - def get_request_by_uuid(uuid) - return unless uuid - ApiLog::EppLog.find_by(uuid: uuid).request - end - - - # callbacks def touch_domain_version domain.try(:touch_with_version) From e3f37081087c7a621b2893201592a66dd7c10b16 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 28 Apr 2016 15:33:17 +0300 Subject: [PATCH 3/9] 117806281-typo --- app/views/admin/domains/partials/_version.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 4f87efe0e..74147b84f 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -123,7 +123,7 @@ %td{colspan: 8} %pre - if version.uuid - = Nokogiri::XML(Epp::ApiLog::EppLog.find_by(uuid: uuid).request) + = Nokogiri::XML(ApiLog::EppLog.find_by(uuid: version.uuid).request) - else = t(:cant_match_version) From 20b831af812dc291bc2da7357a2b55149ca48916 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 10 May 2016 17:24:40 +0300 Subject: [PATCH 4/9] 117806281-request_condition --- app/views/admin/domains/partials/_version.haml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 74147b84f..14f40309d 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -123,7 +123,11 @@ %td{colspan: 8} %pre - if version.uuid - = Nokogiri::XML(ApiLog::EppLog.find_by(uuid: version.uuid).request) + - req = ApiLog::EppLog.find_by(uuid: version.uuid).try(:request) + - if req + = Nokogiri::XML(req) + - else + = t(:cant_match_version) - else = t(:cant_match_version) From 32620692cc85aa229e1e703436ac091f41e9e7c0 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 16 May 2016 11:34:55 +0300 Subject: [PATCH 5/9] 117806281-usability_changes --- app/views/admin/domains/partials/_version.haml | 10 +++++----- app/views/admin/domains/versions.haml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 14f40309d..16f8a300e 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -29,7 +29,7 @@ %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id]) %p.text-right - - if (event == 'update' || event = 'create') && version + - if (event == 'update' || event = 'create') && (version && version.uuid) = link_to event, '#', class: 'js-event' - else = event @@ -52,7 +52,7 @@ %br - if domain.pending_json.present? %p - = link_to t(:pending_epp), '#', class: 'js-pending-toggle' + = link_to t(:pending_epp), '#', class: 'js-pending' %td{class: changing_css_class(version, "period", "period_unit", "valid_from", "valid_to")} %p @@ -118,9 +118,9 @@ = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do = domain.registrar.name - - if (event == 'create' || event == 'update') && version + - if (event == 'create' || event == 'update') && (version && version.uuid) %tr.js-event{ style: 'display: none;' } - %td{colspan: 8} + %td{colspan: 9} %pre - if version.uuid - req = ApiLog::EppLog.find_by(uuid: version.uuid).try(:request) @@ -133,7 +133,7 @@ - if domain.pending_json.present? %tr.js-pending{ style: 'display: none;' } - %td{colspan: 8} + %td{colspan: 9} = preserve do %pre - formatted_req = Nokogiri::XML(domain.pending_json['frame']) diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml index df5085e9b..cfef69872 100644 --- a/app/views/admin/domains/versions.haml +++ b/app/views/admin/domains/versions.haml @@ -37,9 +37,9 @@ domain: version.reify, version: version.previous :coffee - $(document).on 'click', '.js-pending-toggle, .js-event', (e) -> + $(document).on 'click', '.js-pending, .js-event', (e) -> e.preventDefault() - $(document).on 'mousedown', '.js-pending-toggle, .js-event', (e) -> + $(document).on 'mousedown', '.js-pending, .js-event', (e) -> target = $(e.target) - target.parents('tr').next('tr.js-pending, tr.js-event').toggle() + target.parents('tr').nextUntil('tr.small' ,'tr.' + this.className).toggle() From 80a5c9d054feb1a5332bb56614b9e10f7ff68746 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 24 May 2016 14:00:43 +0300 Subject: [PATCH 6/9] 117806281-typo --- app/views/admin/domains/partials/_version.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 16f8a300e..74382f63a 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -29,7 +29,7 @@ %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id]) %p.text-right - - if (event == 'update' || event = 'create') && (version && version.uuid) + - if (event == 'update' || event == 'create') && (version && version.uuid) = link_to event, '#', class: 'js-event' - else = event From 79f2c09d69468e2b9c40be93a938df6ffca8b2d2 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 27 May 2016 14:02:08 +0300 Subject: [PATCH 7/9] 117806281-logic_change --- app/views/admin/domains/partials/_version.haml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 74382f63a..1f50cbc17 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -5,6 +5,7 @@ - if domain.present? - if version # normal history + - epp_req = ApiLog::EppLog.find_by(uuid: version.uuid).try(:request) if version.uuid - children = HashWithIndifferentAccess.new(version.children) - nameservers = Nameserver.all_versions_for(children[:nameservers], version.created_at) - dnskeys = Dnskey.all_versions_for(children[:dnskeys], version.created_at) @@ -14,6 +15,7 @@ - event = version.event - creator = plain_username(version.terminator) - else # pending history + - epp_req = false - nameservers = domain.nameservers - dnskeys = domain.dnskeys - tech_contacts = domain.tech_contacts @@ -29,7 +31,7 @@ %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id]) %p.text-right - - if (event == 'update' || event == 'create') && (version && version.uuid) + - if (event == 'update' || event == 'create') && epp_req = link_to event, '#', class: 'js-event' - else = event @@ -118,16 +120,12 @@ = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do = domain.registrar.name - - if (event == 'create' || event == 'update') && (version && version.uuid) + - if (event == 'create' || event == 'update') && epp_req %tr.js-event{ style: 'display: none;' } %td{colspan: 9} %pre - - if version.uuid - - req = ApiLog::EppLog.find_by(uuid: version.uuid).try(:request) - - if req - = Nokogiri::XML(req) - - else - = t(:cant_match_version) + - if req + = Nokogiri::XML(req) - else = t(:cant_match_version) From d179f1c24417a69313087b5b6f44922e1fa839a1 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 27 May 2016 16:23:46 +0300 Subject: [PATCH 8/9] 117806281-typo --- app/views/admin/domains/partials/_version.haml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 1f50cbc17..3c86a0b7e 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -124,10 +124,7 @@ %tr.js-event{ style: 'display: none;' } %td{colspan: 9} %pre - - if req - = Nokogiri::XML(req) - - else - = t(:cant_match_version) + = Nokogiri::XML(epp_req) - if domain.pending_json.present? %tr.js-pending{ style: 'display: none;' } From be10e84b1b0eb7f018f66b532f6bbaa418008892 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 2 Jun 2016 12:17:25 +0300 Subject: [PATCH 9/9] 117806281-creator_changes --- app/views/admin/domains/partials/_version.haml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index 3c86a0b7e..580a5589a 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -14,6 +14,7 @@ - registrant = Contact.all_versions_for(children[:registrant], version.created_at) - event = version.event - creator = plain_username(version.terminator) + - whodunnit = version.try(:whodunnit) - else # pending history - epp_req = false - nameservers = domain.nameservers @@ -22,7 +23,8 @@ - admin_contacts = domain.admin_contacts - registrant = [domain.registrant] - creator = pending_user.try(:username) - - event = 'pending' + - event = 'pending' + - whodunnit = false %td %p.nowrap @@ -36,7 +38,10 @@ - else = event %br - = creator + - if whodunnit + = whodunnit + - else + = creator - if version %p.text-right = link_to "Pure history", admin_domain_version_path(version)