Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support data html options #1095

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support data html options #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_first_page.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
-%>
<span class="first">
<%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %>
<%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, data: data %>
</span>
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_first_page.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
%span.first
= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote
= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, data: data
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_first_page.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
span.first
== link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote
== link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, data: data
'
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_last_page.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
-%>
<span class="last">
<%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote %>
<%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, data: data %>
</span>
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_last_page.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
%span.last
= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote
= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, data: data
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_last_page.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
span.last
== link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote
== link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, data: data
'
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_next_page.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
-%>
<span class="next">
<%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote %>
<%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote, data: data %>
</span>
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_next_page.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
%span.next
= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote
= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote, data: data
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_next_page.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
span.next
== link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote
== link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote, data: data
'
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_page.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
-%>
<span class="page<%= ' current' if page.current? %>">
<%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
<%= link_to_unless page.current?, page, url, {remote: remote, data: data, rel: page.rel} %>
</span>
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_page.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
%span{class: "page#{' current' if page.current?}"}
= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel}
= link_to_unless page.current?, page, url, {remote: remote, data: data, rel: page.rel}
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_page.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
span class="page#{' current' if page.current?}"
== link_to_unless page.current?, page, url, {remote: remote, rel: page.rel}
== link_to_unless page.current?, page, url, {remote: remote, data: data, rel: page.rel}
'
1 change: 1 addition & 0 deletions kaminari-core/app/views/kaminari/_paginator.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
paginator: the paginator that renders the pagination tags inside
-%>
<%= paginator.render do -%>
Expand Down
1 change: 1 addition & 0 deletions kaminari-core/app/views/kaminari/_paginator.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
-# paginator: the paginator that renders the pagination tags inside
= paginator.render do
%nav.pagination
Expand Down
1 change: 1 addition & 0 deletions kaminari-core/app/views/kaminari/_paginator.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
paginator : the paginator that renders the pagination tags inside

== paginator.render do
Expand Down
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_prev_page.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
total_pages: total number of pages
per_page: number of items to fetch per page
remote: data-remote
data: data html options
-%>
<span class="prev">
<%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote %>
<%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote, data: data %>
</span>
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_prev_page.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# data: data html options
%span.prev
= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote
= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote, data: data
3 changes: 2 additions & 1 deletion kaminari-core/app/views/kaminari/_prev_page.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
total_pages : total number of pages
per_page : number of items to fetch per page
remote : data-remote
data : data html options
span.prev
== link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote
== link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote, data: data
'
1 change: 1 addition & 0 deletions kaminari-core/lib/kaminari/helpers/helper_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ module HelperMethods
# * <tt>:template</tt> - Specify a custom template renderer for rendering the Paginator (receiver by default)
# * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
def paginate(scope, paginator_class: Kaminari::Helpers::Paginator, template: nil, **options)
options[:data] ||= {}
options[:total_pages] ||= scope.total_pages
options.reverse_merge! current_page: scope.current_page, per_page: scope.limit_value, remote: false

Expand Down