Merge branch '117806281-clickable_actions' into staging

This commit is contained in:
Stas 2016-04-28 15:23:58 +03:00
commit 628813f604
3 changed files with 17 additions and 4 deletions

View file

@ -29,7 +29,10 @@
%br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id]) %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id])
%p.text-right %p.text-right
= event - if (event == 'update' || event = 'create') && version
= link_to event, '#', class: 'js-event'
- else
= event
%br %br
= creator = creator
- if version - if version
@ -115,6 +118,15 @@
= link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do
= domain.registrar.name = 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? - if domain.pending_json.present?
%tr.js-pending{ style: 'display: none;' } %tr.js-pending{ style: 'display: none;' }
%td{colspan: 8} %td{colspan: 8}

View file

@ -37,9 +37,9 @@
domain: version.reify, version: version.previous domain: version.reify, version: version.previous
:coffee :coffee
$(document).on 'click', '.js-pending-toggle', (e) -> $(document).on 'click', '.js-pending-toggle, .js-event', (e) ->
e.preventDefault() e.preventDefault()
$(document).on 'mousedown', '.js-pending-toggle', (e) -> $(document).on 'mousedown', '.js-pending-toggle, .js-event', (e) ->
target = $(e.target) target = $(e.target)
target.parents('tr').next('tr.js-pending').toggle() target.parents('tr').next('tr.js-pending, tr.js-event').toggle()

View file

@ -951,3 +951,4 @@ en:
verified: 'Verified' verified: 'Verified'
next: 'Next' next: 'Next'
previous: 'Previous' previous: 'Previous'
cant_match_version: 'Impossible match version with request'