raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Rails 3.2 validates syntax

Browse Source
This commit is contained in:
Pau Perez
2018-10-08 16:54:22 +02:00
parent cbac916e66
commit c8c16f0e8a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/spree/variant_decorator.rb
View File

@@ -18,11 +18,13 @@ Spree::Variant.class_eval do
attr_accessible :unit_value, :unit_description, :images_attributes, :display_as, :display_name, :import_date
accepts_nested_attributes_for :images
validates_presence_of :unit_value,
if: -> v { %w(weight volume).include? v.product.andand.variant_unit }
validates :unit_value, presence: true, if: -> (variant) {
%w(weight volume).include?(variant.product.andand.variant_unit)
}
validates_presence_of :unit_description,
if: -> v { v.product.andand.variant_unit.present? && v.unit_value.nil? }
validates :unit_description, presence: true, if: -> (variant) {
variant.product.andand.variant_unit.present? && variant.unit_value.nil?
}
before_validation :update_weight_from_unit_value, if: -> v { v.product.present? }
after_save :update_units