##// END OF EJS Templates
Fixed that export links include page parameter....
Jean-Philippe Lang -
r9248:04e7b18869ee
parent child
Show More
@@ -23,7 +23,7 module Redmine
23 end
23 end
24
24
25 def link_to(name, options={})
25 def link_to(name, options={})
26 url = { :format => name.to_s.downcase }.merge(options.delete(:url) || {})
26 url = { :format => name.to_s.downcase }.merge(options.delete(:url) || {}).except('page')
27 caption = options.delete(:caption) || name
27 caption = options.delete(:caption) || name
28 html_options = { :class => name.to_s.downcase, :rel => 'nofollow' }.merge(options)
28 html_options = { :class => name.to_s.downcase, :rel => 'nofollow' }.merge(options)
29 @view.content_tag('span', @view.link_to(caption, url, html_options))
29 @view.content_tag('span', @view.link_to(caption, url, html_options))
@@ -305,6 +305,15 class IssuesControllerTest < ActionController::TestCase
305 assert_response :success
305 assert_response :success
306 end
306 end
307
307
308 def test_index_should_omit_page_param_in_export_links
309 get :index, :page => 2
310 assert_response :success
311 assert_select 'a.atom[href=/issues.atom]'
312 assert_select 'a.csv[href=/issues.csv]'
313 assert_select 'a.pdf[href=/issues.pdf]'
314 assert_select 'form#csv-export-form[action=/issues.csv]'
315 end
316
308 def test_index_csv
317 def test_index_csv
309 get :index, :format => 'csv'
318 get :index, :format => 'csv'
310 assert_response :success
319 assert_response :success
General Comments 0
You need to be logged in to leave comments. Login now