| @@ -114,6 +114,8 module ApplicationHelper | |||
|
|
114 | 114 | def pagination_links_full(paginator, count=nil, options={}) |
|
|
115 | 115 | page_param = options.delete(:page_param) || :page |
|
|
116 | 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 | 120 | html = '' |
|
|
119 | 121 | html << link_to_remote(('« ' + l(:label_previous)), |
| @@ -138,9 +140,12 module ApplicationHelper | |||
|
|
138 | 140 | end |
|
|
139 | 141 | |
|
|
140 | 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 | 146 | links = Setting.per_page_options_array.collect do |n| |
|
|
142 | 147 | n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)}, |
|
|
143 |
{:href => url_for(param |
|
|
|
148 | {:href => url_for(url_param.merge(:per_page => n))}) | |
|
|
144 | 149 | end |
|
|
145 | 150 | links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil |
|
|
146 | 151 | end |
General Comments 0
You need to be logged in to leave comments.
Login now