diff --git a/app/models/concerns/email_checkable.rb b/app/models/concerns/email_verifable.rb similarity index 97% rename from app/models/concerns/email_checkable.rb rename to app/models/concerns/email_verifable.rb index ba5784336..de8041c32 100644 --- a/app/models/concerns/email_checkable.rb +++ b/app/models/concerns/email_verifable.rb @@ -1,5 +1,5 @@ module Concerns - module EmailCheckable + module EmailVerifable extend ActiveSupport::Concern def email_verification diff --git a/app/models/contact.rb b/app/models/contact.rb index 4b60e85be..3fec501c8 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -7,7 +7,7 @@ class Contact < ApplicationRecord include Concerns::Contact::Transferable include Concerns::Contact::Identical include Concerns::Contact::Disclosable - include Concerns::EmailCheckable + include Concerns::EmailVerifable belongs_to :original, class_name: self.name belongs_to :registrar, required: true diff --git a/app/models/registrar.rb b/app/models/registrar.rb index 6e6d41b77..470d768b7 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -1,7 +1,7 @@ class Registrar < ApplicationRecord include Versions # version/registrar_version.rb include Concerns::Registrar::BookKeeping - include Concerns::EmailCheckable + include Concerns::EmailVerifable include Concerns::Registrar::LegalDoc has_many :domains, dependent: :restrict_with_error diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index cc80ac744..7ba2220a8 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -85,7 +85,9 @@ %th{class: 'col-xs-2'} = sort_link(@q, 'ident', t(:ident)) %th{class: 'col-xs-2'} - = sort_link(@q, 'email', t(:created_at)) + = sort_link(@q, 'email', t(:email)) + %th{class: 'col-xs-2'} + = sort_link(@q, 'created_at', t(:created_at)) %th{class: 'col-xs-2'} = sort_link(@q, 'registrar_name', t(:registrar_name)) %tbody @@ -94,6 +96,8 @@ %td= link_to(contact, admin_contact_path(contact)) %td= contact.code %td= ident_for(contact) + %td{class: ('text-danger' unless contact.email_verification.success)} + = contact.email %td= l(contact.created_at, format: :short) %td - if contact.registrar diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml index 029f89509..7245ca218 100644 --- a/app/views/admin/contacts/partials/_general.haml +++ b/app/views/admin/contacts/partials/_general.haml @@ -17,7 +17,8 @@ %dd= ident_for(@contact) %dt= t(:email) - %dd= @contact.email + %dd{class: ('text-danger' unless @contact.email_verification.success)} + = @contact.email %dt= t(:phone) %dd= @contact.phone