kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r9382 from trunk. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9383 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-11 17:21:35 +00:00
parent 68ded50edc
commit 4c82fbb6f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/views/other_formats_builder.rb
View File

@ -23,7 +23,7 @@ module Redmine
end
def link_to(name, options={})
url = { :format => name.to_s.downcase }.merge(options.delete(:url) || {})
url = { :format => name.to_s.downcase }.merge(options.delete(:url) || {}).except('page')
caption = options.delete(:caption) || name
html_options = { :class => name.to_s.downcase, :rel => 'nofollow' }.merge(options)
@view.content_tag('span', @view.link_to(caption, url, html_options))

9
test/functional/issues_controller_test.rb
View File

@ -305,6 +305,15 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success
end
def test_index_should_omit_page_param_in_export_links
get :index, :page => 2
assert_response :success
assert_select 'a.atom[href=/issues.atom]'
assert_select 'a.csv[href=/issues.csv]'
assert_select 'a.pdf[href=/issues.pdf]'
assert_select 'form#csv-export-form[action=/issues.csv]'
end
def test_index_csv
get :index, :format => 'csv'
assert_response :success