From b125a899de12a2e524fe5e46fe5c2aa82d988810 Mon Sep 17 00:00:00 2001
From: Victor Ghita <tomi.gvf@gmail.com>
Date: Thu, 14 Dec 2023 12:10:51 +0100
Subject: [PATCH] Add badge type to user card on hover
---
app/views/badges/_badge.html.erb | 3 ++-
app/views/users/_common_card.html.erb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/badges/_badge.html.erb b/app/views/badges/_badge.html.erb
index 06674114b..73b6b2224 100644
--- a/app/views/badges/_badge.html.erb
+++ b/app/views/badges/_badge.html.erb
@@ -3,6 +3,7 @@
<% end %>
<% is_small ||= false %>
+<% badge_type ||= '' %>
<span class="tooltip" id="<%= dom_id badge %>">
<span class="user-badge <%= css_class if defined?(css_class) %>">
@@ -13,7 +14,7 @@
</span>
<span style="white-space: normal;" class="tooltip-text">
<%= is_small ?
- "This user has been awarded the '#{badge.title}' badge."
+ "This user was awarded a #{badge_type} '#{badge.title}' badge."
: badge.description %>
</span>
</span>
\ No newline at end of file
diff --git a/app/views/users/_common_card.html.erb b/app/views/users/_common_card.html.erb
index ebfa4217d..21c7af016 100644
--- a/app/views/users/_common_card.html.erb
+++ b/app/views/users/_common_card.html.erb
@@ -41,7 +41,8 @@
<% end %>
<% if !user.pinned_badge.nil? && SiteSetting['UserCardDetailsBadge'] %>
<span class="badge">
- <%= render user.pinned_badge.badge, css_class: "#{user.pinned_badge.badge_type}-badge", is_small: true %>
+ <%= render user.pinned_badge.badge, css_class: "#{user.pinned_badge.badge_type}-badge", is_small: true,
+ badge_type: user.pinned_badge.badge_type %>
</span>
<% end %>
<% end %>
--
GitLab