Merge branch 'story/115762063--show-historical-nested' into staging

This commit is contained in:
Vladimir Krylov 2016-04-05 09:31:13 +03:00
commit f66750329b
2 changed files with 11 additions and 2 deletions

View file

@ -5,6 +5,7 @@
- if @version - if @version
- children = HashWithIndifferentAccess.new(@version.children) - children = HashWithIndifferentAccess.new(@version.children)
- nameservers = Nameserver.all_versions_for(children[:nameservers], @version.created_at) - nameservers = Nameserver.all_versions_for(children[:nameservers], @version.created_at)
- dnskeys = Dnskey.all_versions_for(children[:dnskeys], @version.created_at)
- tech_contacts = Contact.all_versions_for(children[:tech_contacts], @version.created_at) - tech_contacts = Contact.all_versions_for(children[:tech_contacts], @version.created_at)
- admin_contacts = Contact.all_versions_for(children[:admin_contacts], @version.created_at) - admin_contacts = Contact.all_versions_for(children[:admin_contacts], @version.created_at)
- registrant = Contact.all_versions_for(children[:registrant], @version.created_at) - registrant = Contact.all_versions_for(children[:registrant], @version.created_at)
@ -72,6 +73,15 @@
= ns[:ipv6] = ns[:ipv6]
%br %br
%dt= t(:dnskeys)
%dd
- dnskeys.each do |ns|
= ns[:flags]
= ns[:protocol]
= ns[:alg]
= ns[:public_key].to_s[-20,20]
%br
%dt= t(:registrar) %dt= t(:registrar)
%dd{class: changing_css_class(@version,"registrar_id")} %dd{class: changing_css_class(@version,"registrar_id")}
= 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

View file

@ -106,8 +106,7 @@
= ns.flags = ns.flags
= ns.protocol = ns.protocol
= ns.alg = ns.alg
%br = ns.public_key.to_s[-20,20]
= ns.attributes.except("id", "domain_id", "updated_at", "legacy_domain_id")
%td{class: changing_css_class(version,"registrar_id")} %td{class: changing_css_class(version,"registrar_id")}
- if domain.registrar - if domain.registrar