Update to Redmine 5/Rails 6

app/controllers/concerns/finders.rb

@@ -1,4 +1,4 @@
-module Concerns::Finders
+module Finders
   private
 
   def find_goal(id = params[:id])

app/controllers/foods_controller.rb

@@ -5,7 +5,7 @@ class FoodsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :init_session_filters
   before_action :find_project_by_project_id,

app/controllers/goals_controller.rb

@@ -3,7 +3,7 @@ class GoalsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :find_project_by_project_id, only: [:index, :new, :create]
   before_action :find_goal, only: [:edit, :update, :destroy]

app/controllers/ingredients_controller.rb

@@ -1,5 +1,5 @@
 class IngredientsController < ApplicationController
-  include Concerns::Finders
+  include Finders
 
   before_action :authorize
 end

app/controllers/meals_controller.rb

@@ -3,7 +3,7 @@ class MealsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :find_project_by_project_id, only: [:index, :new, :create]
   before_action :find_quantity_by_quantity_id, only: [:toggle_exposure]

app/controllers/measurement_routines_controller.rb

@@ -1,5 +1,5 @@
 class MeasurementRoutinesController < ApplicationController
-  include Concerns::Finders
+  include Finders
 
   before_action :find_measurement_routine, only: [:show, :edit]
   before_action :authorize

app/controllers/measurements_controller.rb

@@ -3,7 +3,7 @@ class MeasurementsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :init_session_filters
   before_action :find_project_by_project_id, only: [:index, :new, :create, :filter]

app/controllers/quantities_controller.rb

@@ -3,7 +3,7 @@ class QuantitiesController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :init_session_filters
   before_action :find_project_by_project_id, only: [:index, :new, :create, :filter, :parents]
@@ -123,7 +123,7 @@ class QuantitiesController < ApplicationController
   end
 
   def prepare_quantities
-    @quantities = @project.quantities.filter(@project, session[:q_filters])
+    @quantities = @project.quantities.apply_filter(@project, session[:q_filters])
       .includes(:exposures, :formula, :parent)
   end
 end

app/controllers/readouts_controller.rb

@@ -3,7 +3,7 @@ class ReadoutsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :find_measurement_routine_by_measurement_routine_id,
     only: [:index, :toggle_exposure]

app/controllers/targets_controller.rb

@@ -3,7 +3,7 @@ class TargetsController < ApplicationController
   menu_item :body_trackers
   helper :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :find_goal_by_goal_id, only: [:index, :new, :create, :show, :edit, :update,
                                               :destroy, :reapply, :toggle_exposure]

app/controllers/units_controller.rb

@@ -2,7 +2,7 @@ class UnitsController < ApplicationController
   layout 'body_tracking'
   menu_item :body_trackers
 
-  include Concerns::Finders
+  include Finders
 
   before_action :find_project_by_project_id, only: [:index, :create]
   before_action :find_unit, only: [:destroy]

app/models/quantity.rb

@@ -74,7 +74,7 @@ class Quantity < ActiveRecord::Base
   end
 
   # TODO: move as an association extension module
-  def self.filter(project, filters)
+  def self.apply_filter(project, filters)
     quantities = all
 
     if filters[:domain].present?

app/views/layouts/body_tracking.html.erb

@@ -6,4 +6,4 @@
   <%= render partial: 'layouts/sidebar' %>
 <% end %>
 
-<%= render :file => "layouts/base" %>
+<%= render template: "layouts/base" %>

init.rb

@@ -1,8 +1,6 @@
-(Rails::VERSION::MAJOR < 5 ? ActionDispatch : ActiveSupport)::Reloader.to_prepare do
-  Project.include BodyTracking::ProjectPatch
-  CollectiveIdea.include BodyTracking::AwesomeNestedSetPatch
-  ActiveSupport::TestCase.include BodyTracking::PluginFixturesLoader if Rails.env == 'test'
-end
+Project.include BodyTracking::ProjectPatch
+CollectiveIdea.include BodyTracking::AwesomeNestedSetPatch
+ActiveSupport::TestCase.include BodyTracking::PluginFixturesLoader if Rails.env == 'test'
 
 Redmine::Plugin.register :body_tracking do
   name 'Body tracking plugin'

lib/body_tracking/project_patch.rb

@@ -9,7 +9,7 @@ module BodyTracking::ProjectPatch
     has_many :foods, -> { order "foods.name" }, dependent: :destroy,
       extend: BodyTracking::ItemsWithQuantities
     has_many :nutrient_exposures, -> { where view_type: "Nutrient" }, dependent: :destroy,
-      foreign_key: :view_id, foreign_type: :view_type,
+      foreign_key: :view_id,
       class_name: 'Exposure', extend: BodyTracking::TogglableExposures
     has_many :nutrient_quantities, -> { order "lft" }, through: :nutrient_exposures,
       source: 'quantity'
@@ -24,7 +24,7 @@ module BodyTracking::ProjectPatch
     has_many :meal_foods, through: :meal_ingredients, source: 'food',
       extend: BodyTracking::ItemsWithQuantities
     has_many :meal_exposures, -> { where view_type: "Meal" }, dependent: :destroy,
-      foreign_key: :view_id, foreign_type: :view_type,
+      foreign_key: :view_id,
       class_name: 'Exposure', extend: BodyTracking::TogglableExposures
     has_many :meal_quantities, -> { order "lft" }, through: :meal_exposures,
       source: 'quantity'