kotovalexarian-likes-github
/
kaminari--kaminari
mirror of https://github.com/kaminari/kaminari.git
1
0
Fork 0
Code Releases Activity

change #page_entries_info to use model name when collection is empty

This commit is contained in:
Eito Katagiri 2013-01-30 15:38:38 +09:00
parent 3f08b7dae5
commit e4cd9a6fef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/kaminari/helpers/action_view_extension.rb
View File

@ -88,7 +88,7 @@ module Kaminari
def page_entries_info(collection, options = {})
entry_name = if options[:entry_name]
options[:entry_name]
elsif collection.empty? || collection.is_a?(::Kaminari::PaginatableArray)
elsif collection.is_a?(::Kaminari::PaginatableArray)
'entry'
else
if collection.respond_to? :model # DataMapper

4
spec/helpers/action_view_extension_spec.rb
View File

@ -77,7 +77,7 @@ describe 'Kaminari::ActionViewExtension' do
end
context 'having no entries' do
subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
it { should == 'No entries found' }
it { should == 'No users found' }
context 'setting the entry name option to "member"' do
subject { helper.page_entries_info @users, :entry_name => 'member', :params => {:controller => 'users', :action => 'index'} }
@ -151,7 +151,7 @@ describe 'Kaminari::ActionViewExtension' do
end
context 'having no entries' do
subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
it { should == 'No entries found' }
it { should == 'No addresses found' }
end
context 'having 1 entry' do