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 %>