Added MeasurementRoutine as a nested Measurement model
Updated ItemsWithQuantities to work with MeasurementRoutine Replaced ColumnViews HABTM with polymorphic HMT Added Measurement notes Added destroy restrictions on Quantity Replaced BodyTrackingPluginController with Finders concern Removed 'body_trackers' prefix from paths Unified styling for textarea
This commit is contained in:
@@ -7,9 +7,9 @@ module IngredientsHelper
|
||||
|
||||
def toggle_column_options
|
||||
disabled = []
|
||||
enabled_columns = @project.nutrients_column_view.quantities.to_a
|
||||
enabled_quantities = @project.nutrient_quantities.to_a
|
||||
options = nested_set_options(@project.quantities.diet) do |q|
|
||||
disabled << q.id if enabled_columns.include?(q)
|
||||
disabled << q.id if enabled_quantities.include?(q)
|
||||
raw("#{' ' * q.level}#{q.name}")
|
||||
end
|
||||
options_for_select(options, disabled: disabled)
|
||||
|
||||
@@ -11,9 +11,9 @@ module MeasurementsHelper
|
||||
|
||||
def toggle_column_options
|
||||
disabled = []
|
||||
enabled_columns = @scoping_measurement.column_view.quantities
|
||||
enabled_quantities = @routine.quantities.to_a
|
||||
options = nested_set_options(@project.quantities.measurement) do |q|
|
||||
disabled << q.id if enabled_columns.include?(q)
|
||||
disabled << q.id if enabled_quantities.include?(q)
|
||||
raw("#{' ' * q.level}#{q.name}")
|
||||
end
|
||||
options_for_select(options, disabled: disabled)
|
||||
|
||||
Reference in New Issue
Block a user