dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split #per_page_links helper and moved test to specific test case.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11031 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-12-17 20:17:52 +00:00
parent ab3330a945
commit 56669f9b13
3 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/redmine/pagination.rb
+19 -11
View File
@@ -208,22 +208,30 @@ module Redmine
# Renders the "Per page" links.
def per_page_links(selected=nil, item_count=nil, &block)
values = Setting.per_page_options_array
if item_count && values.any?
if item_count > values.first
max = values.detect {|value| value >= item_count} || item_count
values = per_page_options(selected, item_count)
if values.any?
links = values.collect do |n|
n == selected ? n : yield(n, :per_page => n)
end
l(:label_display_per_page, links.join(', '))
end
end
def per_page_options(selected=nil, item_count=nil)
options = Setting.per_page_options_array
if item_count && options.any?
if item_count > options.first
max = options.detect {|value| value >= item_count} || item_count
else
max = item_count
end
values = values.select {|value| value <= max || value == selected}
options = options.select {|value| value <= max || value == selected}
end
if values.empty? || (values.size == 1 && values.first == selected)
return nil
if options.empty? || (options.size == 1 && options.first == selected)
[]
else
options
end
links = values.collect do |n|
n == selected ? n : yield(n, :per_page => n)
end
l(:label_display_per_page, links.join(', '))
end
end
end