From 77077ca196332660f0ee7ae73fc7a0438bbd72ea Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 6 Nov 2019 14:41:38 +0200 Subject: [PATCH] Use predicate instead of checking underlying structure Since Rails 5.0 it returns empty array instead of nil. --- app/views/admin/domains/partials/_admin_contacts.haml | 5 +++-- app/views/admin/domains/partials/_tech_contacts.haml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/admin/domains/partials/_admin_contacts.haml b/app/views/admin/domains/partials/_admin_contacts.haml index bf14bf1bb..8c293b469 100644 --- a/app/views/admin/domains/partials/_admin_contacts.haml +++ b/app/views/admin/domains/partials/_admin_contacts.haml @@ -1,4 +1,5 @@ -- panel_class = @domain.errors.messages[:admin_contacts] ? 'panel-danger' : 'panel-default' +- admin_contacts_invalid = @domain.errors.include?(:admin_contacts) +- panel_class = admin_contacts_invalid ? 'panel-danger' : 'panel-default' .panel{class: panel_class} .panel-heading.clearfix = t('.title') @@ -15,7 +16,7 @@ %td= link_to(ac, admin_contact_path(ac)) %td= ac.code %td= ac.email - - if @domain.errors.messages[:admin_contacts] + - if admin_contacts_invalid %tfoot - @domain.errors.messages[:admin_contacts].each do |x| %tr diff --git a/app/views/admin/domains/partials/_tech_contacts.haml b/app/views/admin/domains/partials/_tech_contacts.haml index c3109bc57..cca87434f 100644 --- a/app/views/admin/domains/partials/_tech_contacts.haml +++ b/app/views/admin/domains/partials/_tech_contacts.haml @@ -1,4 +1,5 @@ -- panel_class = @domain.errors.messages[:tech_contacts] ? 'panel-danger' : 'panel-default' +- tech_contacts_invalid = @domain.errors.include?(:tech_contacts) +- panel_class = tech_contacts_invalid ? 'panel-danger' : 'panel-default' #tech_contacts.panel{class: panel_class} .panel-heading.clearfix = t('.title') @@ -15,7 +16,7 @@ %td= link_to(tc, admin_contact_path(tc)) %td= tc.code %td= tc.email - - if @domain.errors.messages[:tech_contacts] + - if tech_contacts_invalid %tfoot - @domain.errors.messages[:tech_contacts].each do |x| %tr