From 22e1718ce6d8fff33dfc5ede0ccfc1968fe95f0e Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 29 Oct 2017 17:01:30 +1300 Subject: [PATCH] Rubocop fix ups --- app/models/planting.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/planting.rb b/app/models/planting.rb index a29ad9e20..f2cb98c58 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -91,7 +91,7 @@ class Planting < ActiveRecord::Base end def calculate_lifespan - self.lifespan = planted_at.present? && finished_at.present? ? finished_at - planted_at : nil + self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil) end def expected_lifespan @@ -102,7 +102,7 @@ class Planting < ActiveRecord::Base end def days_old - (Date.today - planted_at).to_i if planted_at.present? + (Time.zone.today - planted_at).to_i if planted_at.present? end def percentage_grown