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

diff --git a/app/views/diary_comments/_page.html.erb b/app/views/diary_comments/_page.html.erb
index 53472e3ea1854e4582db68e39194e1593e030db1..66e40cd805733223825fc3bd731cd4ac297bb481 100644 (file)
--- a/app/views/diary_comments/_page.html.erb
+++ b/app/views/diary_comments/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <table class="table table-striped" width="100%">
     <thead>
       <tr>

diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb
index 34f364ac4694a816d04dfd9d96ca21a00fbdde0e..f07db9b6c73c953f0172f28b202e3b4a2b6f8f6f 100644 (file)
--- a/app/views/diary_entries/_page.html.erb
+++ b/app/views/diary_entries/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <h4><%= t ".recent_entries" %></h4>
 
   <%= render @entries %>

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 67b69e8645f0134cd975b228598ed29a358f7961..c8eddcd379b9ca414d44f24b45ffdee99b0f901a 100644 (file)
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -7,7 +7,7 @@
     <% end %>
     <% if newer_id -%>
       <li class="page-item d-flex">
-        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">
@@ -21,7 +21,7 @@
     <% end %>
     <% if older_id -%>
       <li class="page-item d-flex">
-        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">

diff --git a/app/views/traces/_page.html.erb b/app/views/traces/_page.html.erb
index 38cdc734188078e02069a61c113ee652c3331a8d..e1ce3fe48604a897b201f1beeb40837ad9a8b982 100644 (file)
--- a/app/views/traces/_page.html.erb
+++ b/app/views/traces/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :newer_key => "traces.page.newer",
              :older_key => "traces.page.older",

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 8816acb1565a5dfb1a2c9dddb4abbc7f144715b7..d0c7a811755415a3546cd151ca26c80af8f3978d 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <table id="block_list" class="table table-borderless table-striped table-sm">
     <thead>
       <tr>

diff --git a/app/views/users/_page.html.erb b/app/views/users/_page.html.erb
index 3307c7b111c108b566bbd9e4f974a2ce09d33253..8a58a29b7f0d0204cf0cd5f8479fc7815d6c26d8 100644 (file)
--- a/app/views/users/_page.html.erb
+++ b/app/views/users/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= form_tag do %>
     <div class="row">
       <div class="col">