From 096c23f55e9a7ef292282d2703501b90336ff679 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 28 Apr 2016 15:09:51 +0300 Subject: [PATCH] 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'