Merge branch '118007975-dns_management' into staging

This commit is contained in:
Stas 2016-06-16 13:26:34 +03:00
commit 74f0633c09

View file

@ -24,7 +24,7 @@
%b= "#{t(:ds_digest)}:"
= x.css('digest').text
- @data.css('keyData').each do |x|
- @data.css('keyData').each do |x, index|
%tr
%td
%b= "#{t(:flag)}:"
@ -41,12 +41,13 @@
%td{:colspan => "3"}
%b= "#{t(:public_key)}:"
= x.css('pubKey').text
%tr
%td{:colspan => "3"}
= " ".html_safe
- if index != @data.css('keyData').size - 1
%tr
%td{:colspan => "3"}
= " ".html_safe
- if @data.css('dsData').empty?
- @data.css('keyData').each do |x|
- @data.css('keyData').each do |x, index|
%tr
%td
%b= "#{t(:flag)}:"
@ -61,6 +62,7 @@
%td{:colspan => "3"}
%b= "#{t(:public_key)}:"
= x.css('pubKey').text
%tr
%td{:colspan => "3"}
= " ".html_safe
- if index != @data.css('keyData').size - 1
%tr
%td{:colspan => "3"}
= " ".html_safe