From c6c58b177afd2675fbc6026d21b877b2212b34a2 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 31 Mar 2015 16:49:12 +0300 Subject: [PATCH 1/3] Added eager load to admin contact --- app/controllers/admin/contacts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index 5135f2c7f..f789baf1d 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -14,6 +14,6 @@ class Admin::ContactsController < AdminController private def set_contact - @contact = Contact.find(params[:id]) + @contact = Contact.includes(domains: :registrar).find(params[:id]) end end From 42604daf69f38d1569fed5c1e49c9b574eff3126 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 31 Mar 2015 16:50:47 +0300 Subject: [PATCH 2/3] Added eager load to admin contact index --- app/controllers/admin/contacts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index f789baf1d..23d743719 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -3,7 +3,7 @@ class Admin::ContactsController < AdminController before_action :set_contact, only: [:show] def index - @q = Contact.search(params[:q]) + @q = Contact.includes(:registrar).search(params[:q]) @contacts = @q.result.page(params[:page]) end From bd8a37cd07bc85c24992b530276f9873551f2173 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 31 Mar 2015 17:22:07 +0300 Subject: [PATCH 3/3] Updated contact index --- app/views/admin/contacts/index.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index e25620663..fcbbd47a5 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -24,20 +24,20 @@ %th{class: 'col-xs-2'} = sort_link(@q, 'name', t(:name)) %th{class: 'col-xs-2'} - = sort_link(@q, 'ident', t(:identity)) + = sort_link(@q, 'code', t(:code)) + %th{class: 'col-xs-2'} + = sort_link(@q, 'ident', t(:ident)) %th{class: 'col-xs-2'} = sort_link(@q, 'email', t(:email)) - %th{class: 'col-xs-2'} - = sort_link(@q, 'code', t(:code)) %th{class: 'col-xs-2'} = sort_link(@q, 'registrar_name', t(:registrar)) %tbody - @contacts.each do |contact| %tr %td= link_to(contact, admin_contact_path(contact)) + %td= contact.code %td= ident_for(contact) %td= contact.email - %td= contact.code %td - if contact.registrar = link_to(contact.registrar, admin_registrar_path(contact.registrar))