Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Fixed deletion of quantity formula

Browse Source
This commit is contained in:
cryptogopher 2020-05-29 00:10:05 +02:00
parent 008cfdcd26
commit ba634eb516
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/quantities_controller.rb
View File

@ -113,9 +113,11 @@ class QuantitiesController < ApplicationController
:description, :description,
formula_attributes: formula_attributes:
[ [
:id,
:code, :code,
:zero_nil, :zero_nil,
:unit_id :unit_id,
:_destroy
] ]
) )
end end

5
app/models/quantity.rb
View File

@ -14,7 +14,10 @@ class Quantity < ActiveRecord::Base
has_one :formula, inverse_of: :quantity, dependent: :destroy, validate: true has_one :formula, inverse_of: :quantity, dependent: :destroy, validate: true
accepts_nested_attributes_for :formula, allow_destroy: true, accepts_nested_attributes_for :formula, allow_destroy: true,
reject_if: proc { |attrs| attrs['code'].blank? } reject_if: proc { |attrs| attrs['id'].blank? && attrs['code'].blank? }
before_validation do
formula.mark_for_destruction if formula.present? && formula.code.blank?
end
validates :name, presence: true validates :name, presence: true
# Quantity :name uniqueness relaxed to formulas unambiguity # Quantity :name uniqueness relaxed to formulas unambiguity