Permalink
Browse files

Honor the order in the new finder

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 624d5bb commit 9dd8d3d3e4dc1b91cf8489ea9f3fee9bb0c27c65 @dhh dhh committed Apr 15, 2005
Showing with 1 addition and 0 deletions.
  1. +1 −0 activerecord/lib/active_record/associations/has_many_association.rb
@@ -66,6 +66,7 @@ def find(*args)
end
else
options[:conditions] = @finder_sql + (options[:conditions] ? " AND #{options[:conditions]}" : "")
+ options[:order] = options[:order] ? "#{options[:order]}, #{@options[:order]}" : @options[:order]
@association_class.find(args.size == 1 ? args.first : args, options)
end
end

0 comments on commit 9dd8d3d

Please sign in to comment.