Merge branch '108869472-objects_archive' into staging

This commit is contained in:
Stas 2016-03-16 18:51:37 +02:00
commit 0b6bd1b80e
6 changed files with 35 additions and 33 deletions

View file

@ -62,16 +62,17 @@
= t(:action)
%tbody
- @versions.each do |version|
%tr
%td= link_to(version.reify.name, admin_contact_version_path(version.id))
%td= version.reify.code
%td= ident_for(version.reify)
%td= version.reify.phone
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
- if version.reify
%tr
%td= link_to(version.reify.name, admin_contact_version_path(version.id))
%td= version.reify.code
%td= ident_for(version.reify)
%td= version.reify.phone
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
.row

View file

@ -5,7 +5,7 @@
.panel.panel-default{:style => "min-height:420px;"}
.panel-heading
%h3.panel-title
= l(@version.reify.updated_at, format: :short)
= l(@version.created_at, format: :short)
= @version.event
= plain_username(@version.terminator)
.panel-body
@ -85,12 +85,12 @@
- if vs.id == @version.id
%li.active
= link_to admin_contact_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short)
= l(vs.created_at, format: :short)
= vs.event
- else
%li
= link_to admin_contact_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short)
= l(vs.created_at, format: :short)
= vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
= paginate @versions

View file

@ -55,16 +55,17 @@
= t(:action)
%tbody
- @versions.each do |version|
%tr
%td= link_to(version.reify.name, admin_domain_version_path(version.id))
%td
- if version.reify.registrant
= link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant))
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
- if version.reify
%tr
%td= link_to(version.reify.name, admin_domain_version_path(version.id))
%td
- if version.reify.registrant
= link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant))
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
.row

View file

@ -15,7 +15,7 @@
.panel.panel-default{:style => "min-height:400px;"}
.panel-heading
%h3.panel-title
= l(@version.reify.updated_at, format: :short)
= l(@version.created_at, format: :short)
= event
= creator
.panel-body
@ -80,15 +80,15 @@
.panel.panel-default{:style => "min-height:400px;"}
%ul.nav.nav-pills.nav-stacked
- @versions.each do |vs|
- if vs.id == @version.id
- if vs.id == @version.id and vs.reify
%li.active
= link_to admin_domain_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short)
= l(vs.created_at, format: :short)
= vs.event
- else
%li
= link_to admin_domain_version_path(vs.id) do
= l(vs.reify.updated_at, format: :short)
= l(vs.created_at, format: :short)
= vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
= paginate @versions