From 137a16a810bdfa34b6a6883733b7e9b62ab3f352 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Sat, 26 Apr 2025 19:26:34 -0500 Subject: [PATCH] Move to concern --- app/helpers/users_helper.rb | 6 ------ app/models/user/named.rb | 6 ++++++ app/views/cards/display/common/_background.html.erb | 2 +- app/views/cards/display/common/_meta.html.erb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index e0a2c4422..58b3e12d6 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -2,10 +2,4 @@ module UsersHelper def prepend_current_user_to(users_scope) users_scope.to_a.prepend(Current.user).uniq end - - def familiar_name_for(user) - names = user.name.split - return user.name if names.length == 1 - "#{names.first} #{names[1..].map { |n| "#{n[0]}." }.join}" - end end diff --git a/app/models/user/named.rb b/app/models/user/named.rb index 67420ec72..aa4f9b585 100644 --- a/app/models/user/named.rb +++ b/app/models/user/named.rb @@ -16,4 +16,10 @@ module User::Named def initials name.scan(/\b\p{L}/).join.upcase end + + def familiar_name + names = name.split + return name if names.length == 1 + "#{names.first} #{names[1..].map { |n| "#{n[0]}." }.join}" + end end diff --git a/app/views/cards/display/common/_background.html.erb b/app/views/cards/display/common/_background.html.erb index 8852fb765..4db6a088a 100644 --- a/app/views/cards/display/common/_background.html.erb +++ b/app/views/cards/display/common/_background.html.erb @@ -6,6 +6,6 @@
<%= card.closure.reason %> <%= card.closed_at.strftime("%b %d, %Y") %> - by <%= familiar_name_for(card.closed_by) %> + by <%= card.closed_by.familiar_name %>
<% end %> diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb index 9219e44df..559504d6b 100644 --- a/app/views/cards/display/common/_meta.html.erb +++ b/app/views/cards/display/common/_meta.html.erb @@ -17,11 +17,11 @@ <% end %> - Reported by <%= familiar_name_for(card.creator) %> + Reported by <%= card.creator.familiar_name %> <%= card.assignees.any? ? "Assigned to" : "Not assigned" %> - <%= card.assignees.map { |assignee| "#{familiar_name_for(assignee)}" }.to_sentence.html_safe %> + <%= card.assignees.map { |assignee| "#{assignee.familiar_name}" }.to_sentence.html_safe %>