Merge remote-tracking branch 'upstream/pull/5180'

[rails.git] / app / views / user_blocks / _blocks.html.erb

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 8955852c1a818f2219194ad05869a0702aad9e38..8c8557f606e358b196d170209ecbb5779947ccd1 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,37 +1,24 @@
-<table id="block_list" class="table table-borderless table-striped table-sm">
-  <thead>
-    <tr>
-      <% if show_user_name %>
-      <th><%= t ".display_name" %></th>
-      <% end %>
-      <% if show_creator_name %>
-      <th><%= t ".creator_name" %></th>
-      <% end %>
-      <th><%= t ".reason" %></th>
-      <th><%= t ".status" %></th>
-      <th><%= t ".revoker_name" %></th>
-      <th></th>
-      <th></th>
-      <% if show_revoke_link %>
-      <th></th>
-      <% end %>
-    </tr>
-  </thead>
-  <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
-</table>
+<turbo-frame id="pagination" target="_top" data-turbo="false">
+  <table id="block_list" class="table table-borderless table-striped table-sm">
+    <thead>
+      <tr>
+        <% if @show_user_name %>
+        <th><%= t ".display_name" %></th>
+        <% end %>
+        <% if @show_creator_name %>
+        <th><%= t ".creator_name" %></th>
+        <% end %>
+        <th><%= t ".reason" %></th>
+        <th><%= t ".status" %></th>
+        <th><%= t ".revoker_name" %></th>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
+    <%= render :partial => "block", :collection => @user_blocks %>
+  </table>
 
-<ul class='secondary-actions'>
-  <% if @user_blocks_pages.current_page.number > 1 -%>
-    <li><%= link_to t(".previous"), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>
-  <% else -%>
-    <li><%= t(".previous") %></li>
-  <% end -%>
-
-  <li><%= t(".showing_page", :page => @user_blocks_pages.current_page.number) %></li>
-
-  <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
-    <li><%= link_to t(".next"), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>
-  <% else -%>
-    <li><%= t(".next") %></li>
-  <% end -%>
-</ul>
+  <%= render "shared/pagination",
+             :newer_id => @newer_user_blocks_id,
+             :older_id => @older_user_blocks_id %>
+</turbo-frame>