easy-admin-rails 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d516d9564b3e2e33581e101ed5f5fed1fb294407f6de918e2532a3fcef1acea5
-  data.tar.gz: f3f23ffc0489acddce45c29f4324d38397e088fc4b7fc872fb06ed6cf4d07c64
+  metadata.gz: 8077539734038d6d2f5e76fd811bc6350f48fd9f15854c94bacccc0828d597a9
+  data.tar.gz: 8e21d37b20333eb6cc11ed4c8acb0031bae2c7ad86642e210a0bb5ced98ebd3c
 SHA512:
-  metadata.gz: 3632ce6f54bb99a75db6a45471f53f01eb34c132480367f84017c90ab45f4605527f2a87f89a4446e41ff3182decf590c9df0e3d6178034cc713421b41d30ff6
-  data.tar.gz: 20b25f16081adfd5eea8cbbf62d96c35aee0b38da356befed86132d576d20819c9985987ae1d04e557f49b61964492f2c714b1fe9dca981c4867b9dce8051d60
+  metadata.gz: 7f1035f56aae702e202f742b1ef7a2747f6a53d8c0acb1cdecca91b5d137a6044eff7a07a6879437836ce9a6c9f985ddde53f122377592b01881fe7093b33069
+  data.tar.gz: f94fc0dd71cb0d4b04b3b46c4b19e3e91b413a4be0617273e1900cc2a7a3c7fd9024a3340ee0be064650141060627253b4fc751c100e4f0da0b9a6999562aed1

data/app/components/easy_admin/fields/form/belongs_to_component.rb

@@ -17,7 +17,18 @@ module EasyAdmin
 
         # Override to handle belongs_to association field name
         def association_key
-          # Convert belongs_to association name to foreign key
+          # If field specifies a custom foreign_key, use that
+          if field[:foreign_key]
+            return field[:foreign_key]
+          end
+          
+          # If field specifies an association, get the foreign key from Rails reflection
+          if field[:association]
+            reflection = form.object.class.reflect_on_association(field[:association])
+            return reflection.foreign_key if reflection
+          end
+          
+          # Default behavior: Convert field name to foreign key
           # e.g., user -> user_id, category -> category_id
           if field_name.to_s.end_with?('_id')
             field_name
@@ -74,6 +85,28 @@ module EasyAdmin
           current_value.present? ? [current_value] : []
         end
 
+        # Override to get current display value for suggest mode
+        def current_display_value
+          # Get the associated record
+          association_name = field[:association] || field_name
+          associated_record = form.object.public_send(association_name) if form.object.respond_to?(association_name)
+          
+          return "" unless associated_record
+          
+          # Determine how to display the associated record
+          if field[:display_method]
+            associated_record.public_send(field[:display_method])
+          elsif associated_record.respond_to?(:name)
+            associated_record.name
+          elsif associated_record.respond_to?(:title)
+            associated_record.title
+          elsif associated_record.respond_to?(:to_label)
+            associated_record.to_label
+          else
+            "##{associated_record.id}"
+          end
+        end
+
         # Override to ensure hidden input uses the foreign key value
         def render_hidden_inputs
           # Single select - one hidden input with foreign key value

data/app/components/easy_admin/fields/form/select_component.rb

@@ -133,7 +133,7 @@ module EasyAdmin
               class: single_select_input_classes,
               placeholder: suggest_mode? ? placeholder : (field[:placeholder] || "Select #{field_label.downcase}..."),
               readonly: !suggest_mode?,
-              value: suggest_mode? ? "" : current_display_value,
+              value: current_display_value,
               data: suggest_mode? ? {
                 select_field_target: "search",
                 action: "input->select-field#filter keydown->select-field#handleKeydown focus->select-field#openDropdown"

data/app/controllers/easy_admin/resources_controller.rb

@@ -231,18 +231,21 @@ module EasyAdmin
         return
       end
 
+      # Determine the correct parameter key (handle complex model names)
+      param_key = determine_param_key_for_update_field
+      
       # For belongs_to fields, we need to handle foreign key updates
       if @field_config[:type] == :belongs_to
         association_name = @field_config[:name]
         foreign_key = get_foreign_key_name(association_name)
-        field_value = params.dig(@resource_class.param_key, foreign_key)
+        field_value = params.dig(param_key, foreign_key)
         update_attrs = { foreign_key.to_sym => field_value }
       else
         # Create a field object to handle normalization
         field_obj = EasyAdmin::Field.new(@field_name, @field_config[:type], @field_config)
         
         # Get the field value from params
-        field_value = params.dig(@resource_class.param_key, @field_name)
+        field_value = params.dig(param_key, @field_name)
         
         # Normalize the input
         update_attrs = { @field_name => field_value }
@@ -913,5 +916,18 @@ module EasyAdmin
       params[:period].present? ||
       (params[:scope].present? && params[:scope] != determine_current_scope[:scope])
     end
+    
+    def determine_param_key_for_update_field
+      # Try resource param_key first, then fall back to model's natural param key
+      if params.key?(@resource_class.param_key)
+        @resource_class.param_key
+      elsif params.key?(@resource_class.model_class.model_name.param_key)
+        @resource_class.model_class.model_name.param_key
+      else
+        # Handle namespaced models that use slash format (e.g., "catalog/payment_method")
+        namespaced_param_key = @resource_class.model_class.name.underscore
+        params.key?(namespaced_param_key) ? namespaced_param_key : @resource_class.param_key
+      end
+    end
   end
 end

data/lib/easy_admin/version.rb

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Slaurmagan