From 2100aafc1d86134ca4a35ed6862d0a73a2944589 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 26 Nov 2021 16:44:47 +0100
Subject: [PATCH] name
---
app/models/user.rb | 4 ++++
app/views/admin/application/_top.html.erb | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 4ab819ffb..5257ded15 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 ba7522d1b..15a97ce26 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' %>
--
GitLab