Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Fixed nutrients listing for absent quantity

Browse Source
This commit is contained in:
cryptogopher 2019-11-07 00:03:33 +01:00
parent 88e5cb430a
commit 8bad0b0b0f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/ingredients_controller.rb
View File

@ -209,13 +209,13 @@ class IngredientsController < ApplicationController
@nutrients[i] = [] @nutrients[i] = []
requested_n.each do |q_name, value| requested_n.each do |q_name, value|
amount, unitname = value amount, unitname = value
@nutrients[i] << [q_name, "#{amount || '-'} [#{unitname || '-'}]"] @nutrients[i] << [q_name, amount.nil? ? '-' : "#{amount} [#{unitname || '-'}]"]
end end
@extra_nutrients[i] = [] @extra_nutrients[i] = []
extra_n.each do |q_name, value| extra_n.each do |q_name, value|
amount, unitname = value amount, unitname = value
@extra_nutrients[i] << [q_name, "#{amount || '-'} [#{unitname || '-'}]"] @extra_nutrients[i] << [q_name, amount.nil? ? '-' : "#{amount} [#{unitname || '-'}]"]
end end
end end
end end

2
app/models/ingredient.rb
View File

@ -54,7 +54,7 @@ class Ingredient < ActiveRecord::Base
q, deps = unchecked_q.shift q, deps = unchecked_q.shift
if q.formula.blank? || (nutrients[q.name].length == ingredients.count) 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 next
end end