lib/avo/concerns/has_items.rb in avo-3.6.1 vs lib/avo/concerns/has_items.rb in avo-3.6.2

@@ -177,15 +177,13 @@
             field.panel_name == panel
           end
         end
 
         # hydrate_fields fields
-        fields.each do |field|
-          field.hydrate(record: @record, view: @view, resource: self)
+        fields.map do |field|
+          field.dup.hydrate(record: @record, view: @view, resource: self)
         end
-
-        fields
       end
 
       def get_field(id)
         get_field_definitions.find do |f|
           f.id == id.to_sym
@@ -272,10 +270,10 @@
             next true if item.is_a?(Avo::Resources::Items::TabGroup) ||
               item.is_a?(Avo::Resources::Items::Tab) ||
               item.is_heading? ||
               item.is_a?(Avo::Fields::LocationField)
 
-            item.resource.record.respond_to?(:"#{item.id}=")
+            item.resource.record.respond_to?(:"#{item.try(:for_attribute) || item.id}=")
           end
           .select do |item|
             # Check if the user is authorized to view it.
             # This is usually used for has_* fields
             if item.respond_to? :authorized?