From 8bad0b0b0f7231c6f22d6adf6b9347e2c76eb5e3 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Thu, 7 Nov 2019 00:03:33 +0100 Subject: [PATCH] Fixed nutrients listing for absent quantity --- app/controllers/ingredients_controller.rb | 4 ++-- app/models/ingredient.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/ingredients_controller.rb b/app/controllers/ingredients_controller.rb index c54d949..1b01e5a 100644 --- a/app/controllers/ingredients_controller.rb +++ b/app/controllers/ingredients_controller.rb @@ -209,13 +209,13 @@ class IngredientsController < ApplicationController @nutrients[i] = [] requested_n.each do |q_name, value| amount, unitname = value - @nutrients[i] << [q_name, "#{amount || '-'} [#{unitname || '-'}]"] + @nutrients[i] << [q_name, amount.nil? ? '-' : "#{amount} [#{unitname || '-'}]"] end @extra_nutrients[i] = [] extra_n.each do |q_name, value| amount, unitname = value - @extra_nutrients[i] << [q_name, "#{amount || '-'} [#{unitname || '-'}]"] + @extra_nutrients[i] << [q_name, amount.nil? ? '-' : "#{amount} [#{unitname || '-'}]"] end end end diff --git a/app/models/ingredient.rb b/app/models/ingredient.rb index 45eb478..5229cc0 100644 --- a/app/models/ingredient.rb +++ b/app/models/ingredient.rb @@ -54,7 +54,7 @@ class Ingredient < ActiveRecord::Base q, deps = unchecked_q.shift if q.formula.blank? || (nutrients[q.name].length == ingredients.count) - completed_q[q.name] = nutrients.delete(q.name) + completed_q[q.name] = nutrients.delete(q.name) || {} next end