diff --git a/app/models/unit.rb b/app/models/unit.rb index c40753c..d10de22 100644 --- a/app/models/unit.rb +++ b/app/models/unit.rb @@ -10,8 +10,8 @@ class Unit < ApplicationRecord errors.add(:base, :multilevel_nesting) if base.base.present? end validates :symbol, presence: true, uniqueness: {scope: :user_id}, - length: {maximum: columns_hash['symbol'].limit} - validates :description, length: {maximum: columns_hash['description'].limit} + length: {maximum: type_for_attribute(:symbol).limit} + validates :description, length: {maximum: type_for_attribute(:description).limit} validates :multiplier, numericality: {equal_to: 1}, unless: :base validates :multiplier, numericality: {other_than: 0, precision: true, scale: true}, if: :base diff --git a/app/models/user.rb b/app/models/user.rb index e929c59..35f8c76 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,8 +14,8 @@ class User < ApplicationRecord has_many :units, dependent: :destroy validates :email, presence: true, uniqueness: true, - length: {maximum: columns_hash['email'].limit} - validates :unconfirmed_email, length: {maximum: columns_hash['unconfirmed_email'].limit} + length: {maximum: type_for_attribute(:email).limit} + validates :unconfirmed_email, length: {maximum: type_for_attribute(:unconfirmed_email).limit} def to_s email diff --git a/app/views/units/_form.html.erb b/app/views/units/_form.html.erb index cc77f6a..f59b3a8 100644 --- a/app/views/units/_form.html.erb +++ b/app/views/units/_form.html.erb @@ -4,11 +4,11 @@ <%= form.text_field :symbol, form: :unit_form, required: true, autofocus: true, size: 12, - maxlength: @unit.class.columns_hash['symbol'].limit, autocomplete: "off" %> + maxlength: @unit.class.type_for_attribute(:symbol).limit, autocomplete: "off" %> <%= form.text_area :description, form: :unit_form, cols: 30, rows: 1, escape: false, - maxlength: @unit.class.columns_hash['description'].limit, autocomplete: "off" %> + maxlength: @unit.class.type_for_attribute(:description).limit, autocomplete: "off" %> <% unless @unit.base.nil? %>