Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-06 13:25:44 +01:00
Code Issues Packages Projects Releases Activity

Don't generate pagination links with params.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15627 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-07-10 16:47:49 +00:00
parent 21c4665e2a
commit 5d31eb2495
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/pagination.rb
View File

@@ -145,7 +145,7 @@ module Redmine
if block_given? if block_given?
yield text, parameters, options yield text, parameters, options
else else
link_to text, params.merge(parameters), options link_to text, {:params => request.query_parameters.merge(parameters)}, options
end end
end end
end end

6
test/integration/issues_test.rb
View File

@@ -135,11 +135,11 @@ class IssuesTest < Redmine::IntegrationTest
end end
end end
def test_pagination_links_on_index_without_project_id_in_url def test_pagination_links_should_preserve_query_parameters
with_settings :per_page_options => '2' do with_settings :per_page_options => '2' do
get '/issues', :project_id => 'ecookbook' get '/projects/ecookbook/issues?foo=bar'
assert_select 'a[href=?]', '/projects/ecookbook/issues?page=2', :text => '2' assert_select 'a[href=?]', '/projects/ecookbook/issues?foo=bar&page=2', :text => '2'
end end
end end