X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f3219ada148505d3f6f7a4acdf3376d80576b3bb..d5fe598a18eb04b10f4ac29f22a1bccb79185ad4:/lib/classic_pagination/pagination.rb?ds=sidebyside diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb index b435a7111..c59c1a901 100644 --- a/lib/classic_pagination/pagination.rb +++ b/lib/classic_pagination/pagination.rb @@ -158,7 +158,7 @@ module ActionController def create_paginators_and_retrieve_collections #:nodoc: Pagination::OPTIONS[self.class].each do |collection_id, options| - next if options[:actions] && !options[:actions].include?(action_name) + next if options[:actions]&.exclude?(action_name) paginator, collection = paginator_and_collection_for(collection_id, options) @@ -240,10 +240,8 @@ module ActionController # object, its +number+ attribute is used as the value; if the page does # not belong to this Paginator, an ArgumentError is raised. def current_page=(page) - if page.is_a? Page - raise ArgumentError, "Page/Paginator mismatch" unless - page.paginator == self - end + raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self + page = page.to_i @current_page_number = has_page_number?(page) ? page : 1 end @@ -394,7 +392,7 @@ module ActionController @page = page self.padding = padding end - attr_reader :paginator, :page + attr_reader :paginator, :page, :padding, :first, :last # Sets the window's padding (the number of pages on either side of the # window page). @@ -412,7 +410,6 @@ module ActionController @paginator.last end end - attr_reader :padding, :first, :last # Returns an array of Page objects in the current window. def pages