easy-admin-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714d6b87819aca514f1b6547871b544c36f7ba2d9941b3c235df73c6276fad3e
-  data.tar.gz: 42b81c8f6157e0589d4c39ea6684c836154b1e4d5a0c6ab22c723ad34604ab1d
+  metadata.gz: d516d9564b3e2e33581e101ed5f5fed1fb294407f6de918e2532a3fcef1acea5
+  data.tar.gz: f3f23ffc0489acddce45c29f4324d38397e088fc4b7fc872fb06ed6cf4d07c64
 SHA512:
-  metadata.gz: b347e40183ea5cdfed508bf9921826defddb39f9dcd5701746b3622b44d4917a900df3cf029eb5c2decc5a792a313617127909588377f23cbdd6e977edee8d9e
-  data.tar.gz: feb58175155da2dcb224766ba9be58d3bc2837a7fbee6b64353ef823b3879bd164f95772d05f7695e80ee996b19bb84781c5faf0df770d1626c2d7c4da9adfc4
+  metadata.gz: 3632ce6f54bb99a75db6a45471f53f01eb34c132480367f84017c90ab45f4605527f2a87f89a4446e41ff3182decf590c9df0e3d6178034cc713421b41d30ff6
+  data.tar.gz: 20b25f16081adfd5eea8cbbf62d96c35aee0b38da356befed86132d576d20819c9985987ae1d04e557f49b61964492f2c714b1fe9dca981c4867b9dce8051d60

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

@@ -28,21 +28,50 @@ module EasyAdmin
         end
 
         def load_association_record
-          return nil if value.blank?
+          foreign_key_value = get_foreign_key_value
+          return nil if foreign_key_value.blank?
 
           association_class = determine_association
           
-          if value.respond_to?(:id)
+          if foreign_key_value.respond_to?(:id)
             # Already loaded record
-            value
+            foreign_key_value
           else
             # ID value, need to load the record
-            association_class.find_by(id: value)
+            association_class.find_by(id: foreign_key_value)
+          end
+        end
+        
+        def get_foreign_key_value
+          # If foreign_key is explicitly specified, use that field
+          if field[:foreign_key]
+            @record.public_send(field[:foreign_key])
+          elsif field[:association]
+            # Use Rails association reflection to get the foreign key
+            reflection = @record.class.reflect_on_association(field[:association])
+            if reflection
+              @record.public_send(reflection.foreign_key)
+            else
+              # Fallback to the original value (field name)
+              value
+            end
+          else
+            # Default behavior - use the field value
+            value
           end
         end
 
         def determine_association
-          return field[:association] if field[:association]
+          if field[:association]
+            # If association is specified, get the class from the model's reflection
+            association_name = field[:association].to_s
+            reflection = @record.class.reflect_on_association(association_name)
+            if reflection
+              return reflection.klass
+            else
+              raise ArgumentError, "Association '#{association_name}' not found on #{@record.class}"
+            end
+          end
           
           # Try to determine from attribute name
           if field_name.to_s.end_with?('_id')

data/app/components/easy_admin/resources/table_cell_component.rb

@@ -28,7 +28,7 @@ module EasyAdmin
 
       def render_field_value
         # Use the existing field rendering logic from the Rails views
-        field_value = @record.public_send(@field_config[:name])
+        field_value = get_field_value
         
         # Use the same render_field helper that the ERB templates use
         unsafe_raw render_field(
@@ -38,6 +38,15 @@ module EasyAdmin
           record: @record
         )
       end
+      
+      def get_field_value
+        # For belongs_to fields, use the association name if specified
+        if @field_config[:type] == :belongs_to && @field_config[:association]
+          @record.public_send(@field_config[:association])
+        else
+          @record.public_send(@field_config[:name])
+        end
+      end
 
       def render_inline_edit_trigger
         div do

data/lib/easy_admin/resource.rb

@@ -56,7 +56,9 @@ module EasyAdmin
         suggest: options[:suggest], # for dynamic option loading
         display_method: options[:display_method], # for association fields
         help_text: options[:help_text],
-        editable: options[:editable]
+        editable: options[:editable],
+        association: options[:association],
+        foreign_key: options[:foreign_key] # for belongs_to fields
       }]
     end
 
@@ -321,7 +323,9 @@ module EasyAdmin
           multiple: options[:multiple],
           placeholder: options[:placeholder],
           help_text: options[:help_text],
-          editable: options[:editable]
+          editable: options[:editable],
+          association: options[:association],
+          foreign_key: options[:foreign_key]
         }
 
         if @current_tab

data/lib/easy_admin/version.rb

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

metadata

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