X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f7a35c5895b1bd830a9bf2c08ce36e265deb3e4c..6bd6cbd2031e4dce3c81db3fc669dbc42978b225:/lib/classic_pagination/pagination.rb diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb index 328237d52..dbeaf5a40 100644 --- a/lib/classic_pagination/pagination.rb +++ b/lib/classic_pagination/pagination.rb @@ -67,17 +67,17 @@ module ActionController DEFAULT_OPTIONS = { :class_name => nil, :singular_name => nil, - :per_page => 10, + :per_page => 10, :conditions => nil, - :order_by => nil, - :order => nil, - :join => nil, - :joins => nil, - :count => nil, - :include => nil, - :select => nil, - :group => nil, - :parameter => "page" + :order_by => nil, + :order => nil, + :join => nil, + :joins => nil, + :count => nil, + :include => nil, + :select => nil, + :group => nil, + :parameter => "page" }.freeze end @@ -316,6 +316,7 @@ module ActionController # same page number). def ==(other) return false if other.nil? + @paginator == other.paginator && @number == other.number end @@ -326,6 +327,7 @@ module ActionController # if the pages do not belong to the same Paginator object. def <=>(other) raise ArgumentError unless @paginator == other.paginator + @number <=> other.number end @@ -396,7 +398,7 @@ module ActionController # Sets the window's padding (the number of pages on either side of the # window page). def padding=(padding) - @padding = padding < 0 ? 0 : padding + @padding = padding.negative? ? 0 : padding # Find the beginning and end pages of the window @first = if @paginator.has_page_number?(@page.number - @padding) @paginator[@page.number - @padding]