Fixed pagination to work with joins #1034 [scott@sigkill.org]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
7f558cbd05
commit
ad24c6d756
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fixed pagination to work with joins #1034 [scott@sigkill.org]
|
||||
|
||||
* Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 [Dee.Zsombor@gmail.com]
|
||||
|
||||
* Added :confirm option to link_to_remote just like link_to has #1082 [yrashk@fp.org.ua]
|
||||
|
|
|
@ -150,8 +150,8 @@ module ActionController
|
|||
# Returns the total number of items in the collection to be paginated for
|
||||
# the +model+ and given +conditions+. Override this method to implement a
|
||||
# custom counter.
|
||||
def count_collection_for_pagination(model, conditions)
|
||||
model.count(conditions)
|
||||
def count_collection_for_pagination(model, conditions, joins)
|
||||
model.count(conditions,joins)
|
||||
end
|
||||
|
||||
# Returns a collection of items for the given +model+ and +conditions+,
|
||||
|
@ -168,7 +168,7 @@ module ActionController
|
|||
def paginator_and_collection_for(collection_id, options) #:nodoc:
|
||||
klass = options[:class_name].constantize
|
||||
page = @params[options[:parameter]]
|
||||
count = count_collection_for_pagination(klass, options[:conditions])
|
||||
count = count_collection_for_pagination(klass, options[:conditions], options[:join])
|
||||
|
||||
paginator = Paginator.new(self, count, options[:per_page], page)
|
||||
|
||||
|
|
|
@ -415,7 +415,7 @@ module ActiveRecord #:nodoc:
|
|||
# Returns the number of records that meets the +conditions+. Zero is returned if no records match. Example:
|
||||
# Product.count "sales > 1"
|
||||
def count(conditions = nil, joins = nil)
|
||||
tbl_var_name = joins ? table_name[0,1].downcase : ""
|
||||
tbl_var_name = joins ? table_name[0,1].downcase : ""
|
||||
sql = "SELECT COUNT(*) FROM #{table_name} #{tbl_var_name} "
|
||||
sql << ", #{joins} " if joins
|
||||
add_conditions!(sql, conditions)
|
||||
|
|
Loading…
Reference in New Issue