Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Unevaluable formulas return nil (instead of throwing error)

Browse Source 
Filter formula errors are shown in filter view
This commit is contained in:
cryptogopher
2019-11-09 20:36:10 +01:00
parent 70b6e97b87
commit 67b0cd9b66
8 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/ingredients_controller.rb
View File

@@ -196,13 +196,13 @@ class IngredientsController < ApplicationController
end
def prepare_ingredients
@ingredients = @project.ingredients.includes(:ref_unit, :source)
@ingredients, @formula_q = @project.ingredients.includes(:ref_unit, :source)
.filter(@project, session[:filters])
end
def prepare_nutrients
@quantities = @project.quantities.where(primary: true)
ingredients, requested_n, extra_n = @project.ingredients
ingredients, requested_n, extra_n, @formula_q = @project.ingredients
.filter(@project, session[:filters], @quantities)
@nutrients = {}