lib/active_admin/resource.rb in activeadmin-1.0.0.pre1 vs lib/active_admin/resource.rb in activeadmin-1.0.0.pre2
- old
+ new
@@ -142,17 +142,23 @@
def breadcrumb
instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
end
def find_resource(id)
- resource = resource_class.public_send(method_for_find, id)
+ resource = resource_class.public_send *method_for_find(id)
decorator_class ? decorator_class.new(resource) : resource
end
private
- def method_for_find
- resources_configuration[:self][:finder] || :"find_by_#{resource_class.primary_key}"
+ def method_for_find(id)
+ if finder = resources_configuration[:self][:finder]
+ [finder, id]
+ elsif Rails::VERSION::MAJOR >= 4
+ [:find_by, { resource_class.primary_key => id }]
+ else
+ [:"find_by_#{resource_class.primary_key}", id]
+ end
end
def default_csv_builder
@default_csv_builder ||= CSVBuilder.default_for_resource(resource_class)
end