diff --git a/app/controllers/ingredients_controller.rb b/app/controllers/ingredients_controller.rb index 74d0a85..1bd12b4 100644 --- a/app/controllers/ingredients_controller.rb +++ b/app/controllers/ingredients_controller.rb @@ -223,6 +223,9 @@ class IngredientsController < ApplicationController if filters[:name].present? ingredients = ingredients.where("name LIKE ?", "%#{filters[:name]}%") end + if filters[:visibility].present? + ingredients = ingredients.where(hidden: filters[:visibility] == "1" ? false : true) + end ingredients end end diff --git a/app/helpers/ingredients_helper.rb b/app/helpers/ingredients_helper.rb index 7bd404b..94cdc17 100644 --- a/app/helpers/ingredients_helper.rb +++ b/app/helpers/ingredients_helper.rb @@ -14,6 +14,11 @@ module IngredientsHelper options_for_select(options, disabled: disabled) end + def visibility_options(selected) + options = [["all", nil], ["visible", 1], ["hidden", 0]] + options_for_select(options, selected) + end + def unit_options @project.units.map do |u| [u.shortname, u.id] diff --git a/app/views/ingredients/_filters.html.erb b/app/views/ingredients/_filters.html.erb index 1fbea5f..fe492d4 100644 --- a/app/views/ingredients/_filters.html.erb +++ b/app/views/ingredients/_filters.html.erb @@ -1,21 +1,26 @@