From 19e19e5c43c266dae4ec33b908e3b99316c9bcd4 Mon Sep 17 00:00:00 2001 From: kikito Date: Fri, 16 Dec 2016 18:00:18 +0100 Subject: [PATCH] Fixes error when trying to denormalize a model whose dependent field is nil --- app/models/budget/ballot/line.rb | 6 +++--- app/models/budget/investment.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/budget/ballot/line.rb b/app/models/budget/ballot/line.rb index 83dd240b8..85434ad2d 100644 --- a/app/models/budget/ballot/line.rb +++ b/app/models/budget/ballot/line.rb @@ -34,9 +34,9 @@ class Budget private def set_denormalized_ids - self.heading_id ||= self.investment.heading_id - self.group_id ||= self.investment.group_id - self.budget_id ||= self.investment.budget_id + self.heading_id ||= self.investment.try(:heading_id) + self.group_id ||= self.investment.try(:group_id) + self.budget_id ||= self.investment.try(:budget_id) end end end diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index d16e8ef36..23586ec3a 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -215,8 +215,8 @@ class Budget private def set_denormalized_ids - self.group_id ||= self.heading.group_id - self.budget_id ||= self.heading.group.budget_id + self.group_id ||= self.heading.try(:group_id) + self.budget_id ||= self.heading.try(:group).try(:budget_id) end end end