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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/redmine/pagination.rb
View File

@ -208,23 +208,31 @@ 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
else
max = item_count
end
values = values.select {|value| value <= max || value == selected}
end
if values.empty? || (values.size == 1 && values.first == selected)
return nil
end
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
options = options.select {|value| value <= max || value == selected}
end
if options.empty? || (options.size == 1 && options.first == selected)
[]
else
options
end
end
end
end
end

15
test/unit/helpers/application_helper_test.rb
View File

@ -1146,19 +1146,4 @@ RAW
def test_javascript_include_tag_for_plugin_should_pick_the_plugin_javascript
assert_match 'src="/plugin_assets/foo/javascripts/scripts.js"', javascript_include_tag("scripts", :plugin => :foo)
end
def test_per_page_links_should_show_usefull_values
set_language_if_valid 'en'
stubs(:link_to).returns("[link]")
with_settings :per_page_options => '10, 25, 50, 100' do
assert_nil per_page_links(10, 3)
assert_nil per_page_links(25, 3)
assert_equal "Per page: 10, [link]", per_page_links(10, 22)
assert_equal "Per page: [link], 25", per_page_links(25, 22)
assert_equal "Per page: [link], [link], 50", per_page_links(50, 22)
assert_equal "Per page: [link], 25, [link]", per_page_links(25, 26)
assert_equal "Per page: [link], 25, [link], [link]", per_page_links(25, 120)
end
end
end

34
test/unit/lib/redmine/pagination_helper_test.rb Normal file
View File

@ -0,0 +1,34 @@
# Redmine - project management software
# Copyright (C) 2006-2012 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.expand_path('../../../../test_helper', __FILE__)
class ApplicationHelperTest < ActionView::TestCase
include Redmine::Pagination::Helper
def test_per_page_options_should_return_usefull_values
with_settings :per_page_options => '10, 25, 50, 100' do
assert_equal [], per_page_options(10, 3)
assert_equal [], per_page_options(25, 3)
assert_equal [10, 25], per_page_options(10, 22)
assert_equal [10, 25], per_page_options(25, 22)
assert_equal [10, 25, 50], per_page_options(50, 22)
assert_equal [10, 25, 50], per_page_options(25, 26)
assert_equal [10, 25, 50, 100], per_page_options(25, 120)
end
end
end