tweaks

avo-hq · Sep 10, 2024 · 7c498e8 · 7c498e8
1 parent b4dd715
commit 7c498e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/app/controllers/avo/application_controller.rb b/app/controllers/avo/application_controller.rb
@@ -84,12 +84,16 @@ def resource
       Avo.resource_manager.get_resource_by_controller_name @resource_name
     end
 
+    def association_from_params
+      params[:for_attribute] || params[:related_name]
+    end
+
     def related_resource
-      field = find_association_field(resource: @resource, association: params[:related_name])
+      reflection = @record.class.reflect_on_association(association_from_params)
 
-      return field.use_resource if field&.use_resource.present?
+      field = find_association_field(resource: @resource, association: association_from_params, type: reflection.macro)
 
-      reflection = @record.class.reflect_on_association(field&.for_attribute || params[:related_name])
+      return field.use_resource if field&.use_resource.present?
 
       reflected_model = reflection.klass
 

diff --git a/app/controllers/avo/associations_controller.rb b/app/controllers/avo/associations_controller.rb
@@ -6,9 +6,9 @@ class AssociationsController < BaseController
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_authorization
+    before_action :set_reflection
     before_action :set_reflection_field
     before_action :set_related_record, only: [:show]
-    before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_record, only: [:create, :destroy]
@@ -126,7 +126,7 @@ def set_attachment_record
     end
 
     def set_reflection_field
-      @field = find_association_field(resource: @resource, association: @related_resource_name.to_sym)
+      @field = find_association_field(resource: @resource, association: @related_resource_name.to_sym, type: @reflection.macro)
       @field.hydrate(resource: @resource, record: @record, view: Avo::ViewInquirer.new(:new))
     rescue
     end
@@ -171,10 +171,6 @@ def set_related_authorization
       end
     end
 
-    def association_from_params
-      @field&.for_attribute || params[:related_name]
-    end
-
     def source_foreign_key
       @reflection.source_reflection.foreign_key
     end

diff --git a/lib/avo/concerns/find_association_field.rb b/lib/avo/concerns/find_association_field.rb
@@ -1,12 +1,12 @@
 module Avo
   module Concerns
     module FindAssociationField
-      def find_association_field(resource:, association:)
-        if params[:turbo_frame]&.starts_with?("has_")
-          type = params[:turbo_frame][/.*(?=_field)/]
+      def find_association_field(resource:, association: nil, type: nil)
+        if params[:turbo_frame]&.starts_with?("has_") || type.present?
+          type ||= params[:turbo_frame][/.*(?=_field)/]
 
           resource.get_field_definitions.find do |field|
-            (field.id == association.to_sym) && (field.type == type)
+            (field.id == association.to_sym) && (field.type == type.to_s)
           end
         else
           resource.get_field association