Backout pagintion change as the included models are sometimes needed...

This commit is contained in:
Tom Hughes 2009-06-07 16:52:10 +00:00
parent 9cd29b4721
commit 4eb13dac19

View file

@ -175,6 +175,7 @@ module ActionController
def count_collection_for_pagination(model, options)
model.count(:conditions => options[:conditions],
:joins => options[:join] || options[:joins],
:include => options[:include],
:select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count]))
end