Merge pull request #4674 from BrokenEagle/add-missing-associated-attributes

Add missing associated attributes
2021-02-04 00:37:32 -06:00
parent 96ed242dea db68644b65
commit 19db959894
7 changed files with 21 additions and 7 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -35,8 +35,10 @@ class ApplicationController < ActionController::Base
      return
    end

+    model = options[0]&.delete(:model)
    if subject.respond_to?(:includes) && (request.format.json? || request.format.xml?)
-      associations = ParameterBuilder.includes_parameters(params[:only], model_name)
+      model ||= model_name
+      associations = ParameterBuilder.includes_parameters(params[:only], model)
      subject = subject.includes(associations)
    end