##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: issue filters may be lost when paginating after r1026....
Jean-Philippe Lang -
r1051:35c17355fbc6
parent child
Show More
Side by Side Unified
Context file:
r1051:35c17355fbc6 Loading diff...:
Show file before | Show file after | Hide comments
@@ -114,6 +114,8 module ApplicationHelper
114 def pagination_links_full(paginator, count=nil, options={})
114 def pagination_links_full(paginator, count=nil, options={})
115 page_param = options.delete(:page_param) || :page
115 page_param = options.delete(:page_param) || :page
116 url_param = params.dup
116 url_param = params.dup
117 # don't reuse params if filters are present
118 url_param.clear if url_param.has_key?(:set_filter)
117
119
118 html = ''
120 html = ''
119 html << link_to_remote(('&#171; ' + l(:label_previous)),
121 html << link_to_remote(('&#171; ' + l(:label_previous)),
@@ -138,9 +140,12 module ApplicationHelper
138 end
140 end
139
141
140 def per_page_links(selected=nil)
142 def per_page_links(selected=nil)
143 url_param = params.dup
144 url_param.clear if url_param.has_key?(:set_filter)
145
141 links = Setting.per_page_options_array.collect do |n|
146 links = Setting.per_page_options_array.collect do |n|
142 n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
147 n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
143 {:href => url_for(params.dup.merge(:per_page => n))})
148 {:href => url_for(url_param.merge(:per_page => n))})
144 end
149 end
145 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
150 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
146 end
151 end
General Comments 0
You need to be logged in to leave comments. Login now