From 76ce2eeeddde4be32cb18e25748b336a2ca7c480 Mon Sep 17 00:00:00 2001
From: cryptogopher <cryptogopher@noreply.me>
Date: Sat, 23 Nov 2024 02:24:08 +0100
Subject: [PATCH] Display Unit name using #to_s

---
 app/controllers/units_controller.rb    | 2 +-
 app/models/unit.rb                     | 4 ++++
 app/views/default/units/_unit.html.erb | 2 +-
 app/views/units/_unit.html.erb         | 2 +-
 config/locales/en.yml                  | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/units_controller.rb b/app/controllers/units_controller.rb
index 81fdc92..1426fca 100644
--- a/app/controllers/units_controller.rb
+++ b/app/controllers/units_controller.rb
@@ -42,7 +42,7 @@ class UnitsController < ApplicationController
     permitted = params.require(:unit).permit(:base_id)
     if permitted[:base_id].blank? && @unit.multiplier != 1
       permitted.merge!(multiplier: 1)
-      flash.now[:notice] = t(".multiplier_reset", symbol: @unit.symbol)
+      flash.now[:notice] = t(".multiplier_reset", unit: @unit)
     end
 
     run_and_render :index if @unit.update(permitted)
diff --git a/app/models/unit.rb b/app/models/unit.rb
index b4f3c86..f4131de 100644
--- a/app/models/unit.rb
+++ b/app/models/unit.rb
@@ -78,6 +78,10 @@ class Unit < ApplicationRecord
     nil
   end
 
+  def to_s
+    symbol
+  end
+
   def movable?
     subunits.empty?
   end
diff --git a/app/views/default/units/_unit.html.erb b/app/views/default/units/_unit.html.erb
index 1c1ec2d..8a4a6df 100644
--- a/app/views/default/units/_unit.html.erb
+++ b/app/views/default/units/_unit.html.erb
@@ -1,7 +1,7 @@
 <%= tag.tr do %>
   <td class="<%= class_names({subunit: unit.base,
                               grayed: unit.default? && !unit.portable.nil? }) %>">
-    <%= unit.symbol %>
+    <%= unit %>
   </td>
 
   <td class="actions">
diff --git a/app/views/units/_unit.html.erb b/app/views/units/_unit.html.erb
index 7039a05..d04c175 100644
--- a/app/views/units/_unit.html.erb
+++ b/app/views/units/_unit.html.erb
@@ -5,7 +5,7 @@
            data: {drag_path: rebase_unit_path(unit), drop_id: dom_id(unit.base || unit)} do %>
 
   <td class="<%= class_names('link', {subunit: unit.base}) %>">
-    <%= link_to unit.symbol, edit_unit_path(unit), id: dom_id(unit, :edit),
+    <%= link_to unit, edit_unit_path(unit), id: dom_id(unit, :edit),
       onclick: 'this.blur();', data: {turbo_stream: true} %>
   </td>
   <td><%= unit.name %></td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2e45765..20cb320 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -64,7 +64,7 @@ en:
     update:
       success: Updated unit
     rebase:
-      multiplier_reset: Multiplier of "%{symbol}" has been reset to 1, due to repositioning
+      multiplier_reset: Multiplier of "%{unit}" has been reset to 1, due to repositioning
     destroy:
       success: Deleted unit
   default: