Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Replaced Quantity 'primary' attr with ColumnView model

Browse Source
This commit is contained in:
cryptogopher
2019-12-14 23:56:36 +01:00
parent ccf26d1830
commit 0c0ca1d286
19 changed files with 91 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/ingredients_helper.rb
View File

@@ -5,10 +5,11 @@ module IngredientsHelper
end
end
def nutrient_column_options
def toggle_column_options
disabled = []
enabled_columns = @project.nutrients_column_view.quantities
options = nested_set_options(@project.quantities.diet) do |q|
disabled << q.id if q.primary
disabled << q.id if enabled_columns.include?(q)
raw("#{'&ensp;' * q.level}#{q.name}")
end
options_for_select(options, disabled: disabled)

5
app/helpers/measurements_helper.rb
View File

@@ -12,10 +12,11 @@ module MeasurementsHelper
amount.nil? ? '-' : "#{amount} [#{unitname || '-'}]"
end
def quantity_toggle_options
def toggle_column_options
disabled = []
enabled_columns = @measurement.column_view.quantities
options = nested_set_options(@project.quantities.measurement) do |q|
disabled << q.id if q.primary
disabled << q.id if enabled_columns.include?(q)
raw("#{'&ensp;' * q.level}#{q.name}")
end
options_for_select(options, disabled: disabled)