diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb index 15d38ad7f..9dda025b5 100644 --- a/app/controllers/registrant/domains_controller.rb +++ b/app/controllers/registrant/domains_controller.rb @@ -20,8 +20,10 @@ class Registrant::DomainsController < RegistrantController send_data raw_csv, filename: 'domains.csv', type: "#{Mime[:csv]}; charset=utf-8" end format.pdf do - @domains = domains - raw_pdf = domains.pdf(render_to_string('registrant/domains/download_list', layout: false)) + view = ActionView::Base.new(ActionController::Base.view_paths, domains: domains) + raw_html = view.render(file: 'registrant/domains/download_list', layout: false) + raw_pdf = domains.pdf(raw_html) + send_data raw_pdf, filename: 'domains.pdf' end end diff --git a/app/controllers/registrar/contacts_controller.rb b/app/controllers/registrar/contacts_controller.rb index 2bc15fd9c..f418a672b 100644 --- a/app/controllers/registrar/contacts_controller.rb +++ b/app/controllers/registrar/contacts_controller.rb @@ -45,8 +45,11 @@ class Registrar send_data raw_csv, filename: 'contacts.csv', type: "#{Mime[:csv]}; charset=utf-8" end format.pdf do - @contacts = contacts - raw_pdf = contacts.pdf(render_to_string('registrar/contacts/download_list', layout: false)) + view = ActionView::Base.new(ActionController::Base.view_paths, contacts: contacts) + view.class_eval { include ::ApplicationHelper } + raw_html = view.render(file: 'registrar/contacts/download_list', layout: false) + raw_pdf = contacts.pdf(raw_html) + send_data raw_pdf, filename: 'contacts.pdf' end end diff --git a/app/views/registrant/domains/download_list.haml b/app/views/registrant/domains/download_list.haml deleted file mode 100644 index b37e3a42a..000000000 --- a/app/views/registrant/domains/download_list.haml +++ /dev/null @@ -1,28 +0,0 @@ -!!! -%html - %head - %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"} - %title Contacts - %body - .col-md-12 - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead - %tr - %th{class: 'col-xs-2'} - =t(:name) - %th{class: 'col-xs-2'} - =t('.registrant') - %th{class: 'col-xs-2'} - =t(:valid_to) - %th{class: 'col-xs-2'} - =t(:registrar_name) - %tbody - - @domains.each do |x| - %tr - %td= x.name - %td= x.registrant - %td= l(x.valid_to, format: :short) - %td= x.registrar - .row - .col-md-6 diff --git a/app/views/registrant/domains/download_list.html.erb b/app/views/registrant/domains/download_list.html.erb new file mode 100644 index 000000000..9e1d39339 --- /dev/null +++ b/app/views/registrant/domains/download_list.html.erb @@ -0,0 +1,32 @@ + + + +
+
+
+ + + + + + + + + + + + <% @domains.each do |x| %> + + + + + + + <% end %> + +
<%= t(:name) %><%= t('.registrant') %><%= t(:valid_to) %><%= t(:registrar_name) %>
<%= x.name %><%= x.registrant %><%= l(x.valid_to, format: :short) %><%= x.registrar %>
+
+
+
+ + diff --git a/app/views/registrar/contacts/download_list.haml b/app/views/registrar/contacts/download_list.haml deleted file mode 100644 index 51423a3f2..000000000 --- a/app/views/registrar/contacts/download_list.haml +++ /dev/null @@ -1,30 +0,0 @@ -!!! -%html - %head - %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"} - %title Contacts - %body - .row - .col-md-12 - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead - %tr - %th{class: 'col-xs-2'} - =t(:name) - %th{class: 'col-xs-2'} - =t(:id) - %th{class: 'col-xs-2'} - =t(:ident) - %th{class: 'col-xs-2'} - =t(:created_at) - %th{class: 'col-xs-2'} - =t(:registrar_name) - %tbody - - @contacts.each do |contact| - %tr - %td= contact - %td= contact.code - %td= ident_for(contact) - %td= l(contact.created_at, format: :short) - %td= contact.registrar diff --git a/app/views/registrar/contacts/download_list.html.erb b/app/views/registrar/contacts/download_list.html.erb new file mode 100644 index 000000000..63ba9205c --- /dev/null +++ b/app/views/registrar/contacts/download_list.html.erb @@ -0,0 +1,34 @@ + + + +
+
+
+ + + + + + + + + + + + + <% @contacts.each do |contact| %> + + + + + + + + <% end %> + +
<%= t(:name) %><%= t(:id) %><%= t(:ident) %><%= t(:created_at) %><%= t(:registrar_name) %>
<%= contact %><%= contact.code %><%= ident_for(contact) %><%= l(contact.created_at, format: :short) %><%= contact.registrar %>
+
+
+
+ +