From be07b5fd0eec17df17d97bc12a8e726cdc0cafb0 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 14 Jan 2017 20:09:09 +1300 Subject: [PATCH] Only check values.zero? if they are present --- app/models/garden.rb | 2 +- app/models/harvest.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/garden.rb b/app/models/garden.rb index be5def706..d4b132f54 100644 --- a/app/models/garden.rb +++ b/app/models/garden.rb @@ -48,7 +48,7 @@ class Garden < ActiveRecord::Base after_validation :cleanup_area def cleanup_area - self.area = nil if area.zero? + self.area = nil if area && area.zero? self.area_unit = nil if area.blank? end diff --git a/app/models/harvest.rb b/app/models/harvest.rb index 1cd5fa563..571157d2f 100644 --- a/app/models/harvest.rb +++ b/app/models/harvest.rb @@ -68,9 +68,9 @@ class Harvest < ActiveRecord::Base end def cleanup_quantities - self.quantity = nil if quantity.zero? + self.quantity = nil if quantity && quantity.zero? self.unit = nil if quantity.blank? - self.weight_quantity = nil if weight_quantity.zero? + self.weight_quantity = nil if weight_quantity && weight_quantity.zero? self.weight_unit = nil if weight_quantity.blank? end