fix pagination
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
<%= local_assigns[:right_additional_html] %>
|
<%= local_assigns[:right_additional_html] %>
|
||||||
<div class="join">
|
<div class="join">
|
||||||
<% if pagy.previous %>
|
<% if pagy.previous %>
|
||||||
<%= link_to '«', url_for(page: pagy.previous), class: 'join-item btn min-h-full h-10' %>
|
<%= link_to '«', url_for(params: request.query_parameters.merge('page' => pagy.previous)), class: 'join-item btn min-h-full h-10' %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
|
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
<% if local_assigns[:next_page_path].present? %>
|
<% if local_assigns[:next_page_path].present? %>
|
||||||
<%= link_to '»', local_assigns[:next_page_path], class: 'join-item btn min-h-full h-10' %>
|
<%= link_to '»', local_assigns[:next_page_path], class: 'join-item btn min-h-full h-10' %>
|
||||||
<% elsif pagy.next %>
|
<% elsif pagy.next %>
|
||||||
<%= link_to '»', url_for(page: pagy.next), class: 'join-item btn min-h-full h-10' %>
|
<%= link_to '»', url_for(params: request.query_parameters.merge('page' => pagy.next)), class: 'join-item btn min-h-full h-10' %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
|
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
<form action="<%= url_for %>" method="get" class="items-center flex">
|
<form action="<%= url_for %>" method="get" class="items-center flex">
|
||||||
<% if params[:status].present? %>
|
|
||||||
<input name="status" value="<%= params[:status] %>" class="hidden">
|
|
||||||
<% end %>
|
|
||||||
<% Submissions::Filter::ALLOWED_PARAMS.each do |key| %>
|
<% Submissions::Filter::ALLOWED_PARAMS.each do |key| %>
|
||||||
<% if params[key].present? %>
|
<% if params[key].present? %>
|
||||||
<input name="<%= key %>" value="<%= params[key] %>" class="hidden">
|
<input name="<%= key %>" value="<%= params[key] %>" class="hidden">
|
||||||
|
|||||||
@@ -106,7 +106,7 @@
|
|||||||
<div class="flex items-center space-x-1.5">
|
<div class="flex items-center space-x-1.5">
|
||||||
<div class="join">
|
<div class="join">
|
||||||
<% if @pagy.previous %>
|
<% if @pagy.previous %>
|
||||||
<%= link_to '«', url_for(page: @pagy.previous, anchor: 'log'), class: 'join-item btn min-h-full h-10' %>
|
<%= link_to '«', url_for(params: request.query_parameters.merge('page' => @pagy.previous), anchor: 'log'), class: 'join-item btn min-h-full h-10' %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
|
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
<%= "Page #{@pagy.page}" %>
|
<%= "Page #{@pagy.page}" %>
|
||||||
</span>
|
</span>
|
||||||
<% if @pagy.next %>
|
<% if @pagy.next %>
|
||||||
<%= link_to '»', url_for(page: @pagy.next, anchor: 'log'), class: 'join-item btn min-h-full h-10' %>
|
<%= link_to '»', url_for(params: request.query_parameters.merge('page' => @pagy.next), anchor: 'log'), class: 'join-item btn min-h-full h-10' %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
|
<span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user