lib/active_admin/csv_builder.rb in activeadmin-1.0.0.pre5 vs lib/active_admin/csv_builder.rb in activeadmin-1.0.0

@@ -20,11 +20,11 @@
     # The CSVBuilder's columns would be Id followed by this
     # resource's content columns
     def self.default_for_resource(resource)
       new resource: resource do
         column :id
-        resource.content_columns.each { |c| column c.name.to_sym }
+        resource.content_columns.each { |c| column c }
       end
     end
 
     attr_reader :columns, :options, :view_context
 
@@ -103,10 +103,10 @@
         @data = block || name.to_sym
       end
 
       def humanize_name(name, resource, humanize_name_option)
         if humanize_name_option
-          name.is_a?(Symbol) && resource.present? ? resource.human_attribute_name(name) : name.to_s.humanize
+          name.is_a?(Symbol) && resource ? resource.resource_class.human_attribute_name(name) : name.to_s.humanize
         else
           name.to_s
         end
       end
     end