From a4dc7a1ed4e5c4233420a549207f0dffe335efc0 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Mon, 2 Dec 2013 06:43:15 +0900 Subject: [PATCH] Do not pass :param_name option in paginate method Do it in Tag class so we don't have to give it on the helper method. --- lib/kaminari/helpers/action_view_extension.rb | 2 +- lib/kaminari/helpers/tags.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kaminari/helpers/action_view_extension.rb b/lib/kaminari/helpers/action_view_extension.rb index f4ffc41..dc7510c 100644 --- a/lib/kaminari/helpers/action_view_extension.rb +++ b/lib/kaminari/helpers/action_view_extension.rb @@ -15,7 +15,7 @@ module Kaminari # * :remote - Ajax? (false by default) # * :ANY_OTHER_VALUES - Any other hash key & values would be directly passed into each tag as :locals value. def paginate(scope, options = {}, &block) - paginator = Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :total_pages => scope.total_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false) + paginator = Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :total_pages => scope.total_pages, :per_page => scope.limit_value, :remote => false) paginator.to_s end diff --git a/lib/kaminari/helpers/tags.rb b/lib/kaminari/helpers/tags.rb index 2cf74e9..a59e2a6 100644 --- a/lib/kaminari/helpers/tags.rb +++ b/lib/kaminari/helpers/tags.rb @@ -15,7 +15,7 @@ module Kaminari class Tag def initialize(template, options = {}) #:nodoc: @template, @options = template, options.dup - @param_name = @options.delete(:param_name) + @param_name = @options.delete(:param_name) || Kaminari.config.param_name @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : '' @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params end