Skip to content

fix extra parameters params for the links #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinhughes27 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix extra parameters params for the links #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/kaminari/helpers/sinatra_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ def paginate(scope, options = {})
current_path = env['PATH_INFO'] rescue nil
current_params = Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {}

template = ActionViewTemplateProxy.new current_params: current_params, current_path: current_path, param_name: options[:param_name] || Kaminari.config.param_name
template = ActionViewTemplateProxy.new(
current_params: current_params.merge(options[:params]),
current_path: current_path,
param_name: options[:param_name] || Kaminari.config.param_name
)

super scope, {template: template}.merge(options)
end
Expand Down
18 changes: 18 additions & 0 deletions test/helpers/sinatra_helpers_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,24 @@ def last_document
assert_match(/user_page=\d+/, elm.attribute('href').value)
end
end

test 'should allow extra params' do
mock_app do
register Kaminari::Helpers::SinatraHelpers
get '/users' do
@page = params[:page] || 1
@users = User.page(@page).per(3)
@options = {params: {foo: 'bar'}}
erb ERB_TEMPLATE_FOR_PAGINATE.dup
end
end

get '/users'

last_document.search('.page a').each do |elm|
assert_match(/foo=bar/, elm.attribute('href').value)
end
end
end
end

Expand Down