diff --git a/app/models/user.rb b/app/models/user.rb index 4ab819ffb4d8ec62febf28672ab716cc72fc1361..5257ded154caa3dda4a560d12622cd8ccc292b05 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -65,6 +65,10 @@ class User < ApplicationRecord scope :ordered, -> { order(:last_name, :first_name) } + def human_name + "#{first_name} #{last_name}" + end + def to_s "#{last_name} #{first_name}" end diff --git a/app/views/admin/application/_top.html.erb b/app/views/admin/application/_top.html.erb index ba7522d1b8f3afbbe9d1ad4995893498decf032b..15a97ce2634425b69c349b064a6700682f9ff162 100644 --- a/app/views/admin/application/_top.html.erb +++ b/app/views/admin/application/_top.html.erb @@ -7,7 +7,7 @@ <ul class="navbar-nav navbar-align"> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle d-none d-sm-inline-block js-user-dropdown-toggle" href="#" data-bs-toggle="dropdown"> - <span class="text-dark"><%= current_user %></span> + <span class="text-dark"><%= current_user.human_name %></span> </a> <div class="dropdown-menu dropdown-menu-end"> <%= link_to t('menu.profile'), edit_user_registration_path, class: 'dropdown-item' %>