zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-12 04:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '108869472-objects_archive' into staging

Browse source 
# Conflicts:
#	app/views/admin/domain_versions/show.haml
This commit is contained in:
Vladimir Krylov 2016-06-10 14:09:52 +03:00
commit 4bbebe8ad6
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/admin/domain_versions/archive.haml
View file

@ -56,14 +56,19 @@
%tbody %tbody
- @versions.each do |version| - @versions.each do |version|
- if version - if version
- domain = Domain.new(version.object.to_h) - domain = Domain.new(version.object.to_h)
- version.object_changes.to_h.each{|k,v| domain[k]=v.last} - version.object_changes.to_h.each{|k,v| domain[k]=v.last}
%tr %tr
%td= link_to(domain.name, admin_domain_version_path(version.id)) %td= link_to(domain.name, admin_domain_version_path(version.id))
%td %td
- if domain.registrant - if domain.registrant
= domain.registrant = domain.registrant.name
- else
- contact = Contact.all_versions_for([domain.registrant_id], version.created_at).first
- if contact.nil? && ver = ContactVersion.where(item_id: domain.registrant_id).last
- contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}){|(k,v), o| o[k]=v.last } ))
= contact.try(:name)
%td %td
- if domain.registrar - if domain.registrar
= link_to(domain.registrar, admin_registrar_path(domain.registrar)) = link_to(domain.registrar, admin_registrar_path(domain.registrar))

2
app/views/admin/domain_versions/show.haml
View file

@ -98,7 +98,7 @@
= 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
%span{:style => "margin: 20px 20px; clear:both;"} %span{:style => "margin: 20px 20px; clear:both;"}
- if @version.previous - if @version.previous
= link_to(t(:previous), = link_to(t(:previous),
admin_domain_version_path(@version.previous.id), admin_domain_version_path(@version.previous.id),