1
0

Added Source perms and routing

Added Quantity displayed defaults
This commit is contained in:
cryptogopher 2019-09-23 15:05:26 +02:00
parent e58952b0e7
commit ce9f011694
4 changed files with 13 additions and 4 deletions

View File

@ -13,4 +13,10 @@ class Quantity < ActiveRecord::Base
validate if: -> { parent.present? } do
errors.add(:parent, :parent_domain_mismatch) unless domain == parent.domain
end
after_initialize do
if new_record?
self.displayed = false if self.displayed.nil?
end
end
end

View File

@ -9,6 +9,7 @@ resources :projects do
resources :ingredients, :only => [:index, :create, :destroy] do
post 'import', on: :collection
end
resources :sources, :only => [:index, :create, :destroy]
resources :quantities, :only => [:index, :create, :destroy]
resources :units, :only => [:index, :create, :destroy]
end

View File

@ -54,13 +54,13 @@ class CreateUnits < ActiveRecord::Migration
# https://www.fsai.ie/uploadedFiles/Consol_Reg1169_2011.pdf
# https://www.fsai.ie/legislation/food_legislation/food_information_fic/nutrition_labelling.html
e = Quantity.create project: nil, domain: :diet, parent: nil, name: "Energy",
description: "Total energy"
description: "Total energy", displayed: true
Quantity.create project: nil, domain: :diet, parent: nil, name: "Proteins",
description: "Total amount of proteins"
description: "Total amount of proteins", displayed: true
f = Quantity.create project: nil, domain: :diet, parent: nil, name: "Fats",
description: "Total lipids, including phospholipids"
description: "Total lipids, including phospholipids", displayed: true
f1 = Quantity.create project: nil, domain: :diet, parent: f, name: "Fatty acids",
description: ""
f2 = Quantity.create project: nil, domain: :diet, parent: f1, name: "Saturated",
@ -87,7 +87,7 @@ class CreateUnits < ActiveRecord::Migration
description: "Docosahexaenoic acid"
c1 = Quantity.create project: nil, domain: :diet, parent: nil, name: "Carbohydrates",
description: "Total amount of carbohydrates"
description: "Total amount of carbohydrates", displayed: true
c2 = Quantity.create project: nil, domain: :diet, parent: c1, name: "Digestible",
description: ""
c3 = Quantity.create project: nil, domain: :diet, parent: c2, name: "Sugars",

View File

@ -14,12 +14,14 @@ Redmine::Plugin.register :body_tracking do
permission :view_body_trackers, {
:body_trackers => [:index],
:ingredients => [:index],
:sources => [:index],
:quantities => [:index],
:units => [:index],
}, read: true
permission :manage_common, {
:body_trackers => [:defaults],
:ingredients => [:create, :destroy, :import],
:sources => [:create, :destroy],
:quantities => [:create, :destroy],
:units => [:create, :destroy],
}, require: :loggedin