Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added zero_nil to Ingredients filter formula

Browse Source 
Displaying formulas errors for Nutrients view
Substituted onblur for Ingredients filters with hidden submit
This commit is contained in:
cryptogopher
2020-03-22 01:02:37 +01:00
parent c3b783e942
commit 10325c9c39
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/ingredients_controller.rb
View File

@@ -69,7 +69,7 @@ class IngredientsController < BodyTrackingPluginController
end
def filter
session[:i_filters] = params[:filters]
session[:i_filters] = params.permit(:name, :visibility, formula: [:code, :zero_nil])
prepare_items
render :index
end
@@ -178,7 +178,7 @@ class IngredientsController < BodyTrackingPluginController
private
def init_session_filters
session[:i_filters] ||= {}
session[:i_filters] ||= {formula: {}}
end
def ingredient_params

3
app/controllers/measurements_controller.rb
View File

@@ -69,8 +69,7 @@ class MeasurementsController < BodyTrackingPluginController
end
def filter
session[:m_filters][:name] = params[:filters][:name]
session[:m_filters][:formula] = params[:filters][:formula]
session[:m_filters] = params.permit(:name, formula: [:code, :zero_nil])
readouts_view? ? prepare_readouts : prepare_measurements
render :index
end