Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Multiplier in nil for toplevel units

Browse Source
This commit is contained in:
cryptogopher 2024-01-09 00:08:53 +01:00
parent 41d24efb52
commit 92132768fa
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/unit.rb
View File

@ -1,16 +1,14 @@
class Unit < ApplicationRecord
attribute :multiplier, default: 1
belongs_to :user, optional: true
belongs_to :base, optional: true, class_name: "Unit"
validates :symbol, presence: true, uniqueness: {scope: :user_id},
length: {maximum: columns_hash['symbol'].limit}
validates :name, length: {maximum: columns_hash['name'].limit}
validates :multiplier, numericality: {equal_to: 1}, unless: :base
validates :multiplier, numericality: {other_than: 1}, if: :base
validate if: -> { base.present? } do
errors.add(:base, :only_top_level_base_units) unless base.base.nil?
validates :multiplier, absence: true, unless: :base
validates :multiplier, presence: true, numericality: {other_than: 0}, if: :base
validate if: ->{ base&.base.present? } do
errors.add(:base, :multilevel_nesting)
end
acts_as_nested_set parent_column: :base_id, scope: :user, dependent: :destroy,

2
app/views/units/_index.html.erb
View File

@ -4,7 +4,7 @@
<%= link_to unit.symbol, edit_unit_path(unit), class: level > 0 ? 'subunit' : '' %>
</td>
<td><%= unit.name %></td>
<td class="number"><%= scientifize(unit.multiplier) unless unit.multiplier == 1 %></td>
<td class="number"><%= scientifize(unit.multiplier) if unit.multiplier %></td>
<% if current_user.at_least(:active) %>
<td class="actions">
<%= image_button_to t(".delete_unit"), "delete-outline", unit_path(unit),