From 52324cba89a3f4d211535119a20f967593813c09 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 23 Aug 2024 15:00:55 +0300 Subject: [PATCH] Disable turbo on all links inside pagination frames except older/newer --- app/views/diary_comments/_page.html.erb | 2 +- app/views/diary_entries/_page.html.erb | 2 +- app/views/shared/_pagination.html.erb | 4 ++-- app/views/traces/_page.html.erb | 2 +- app/views/user_blocks/_blocks.html.erb | 2 +- app/views/users/_page.html.erb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/diary_comments/_page.html.erb b/app/views/diary_comments/_page.html.erb index 53472e3ea..66e40cd80 100644 --- a/app/views/diary_comments/_page.html.erb +++ b/app/views/diary_comments/_page.html.erb @@ -1,4 +1,4 @@ - + diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb index 34f364ac4..f07db9b6c 100644 --- a/app/views/diary_entries/_page.html.erb +++ b/app/views/diary_entries/_page.html.erb @@ -1,4 +1,4 @@ - +

<%= t ".recent_entries" %>

<%= render @entries %> diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb index 67b69e864..c8eddcd37 100644 --- a/app/views/shared/_pagination.html.erb +++ b/app/views/shared/_pagination.html.erb @@ -7,7 +7,7 @@ <% end %> <% if newer_id -%>
  • - <%= 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" } %>
  • <% else -%>
  • @@ -21,7 +21,7 @@ <% end %> <% if older_id -%>
  • - <%= 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" } %>
  • <% else -%>
  • diff --git a/app/views/traces/_page.html.erb b/app/views/traces/_page.html.erb index 38cdc7341..e1ce3fe48 100644 --- a/app/views/traces/_page.html.erb +++ b/app/views/traces/_page.html.erb @@ -1,4 +1,4 @@ - + <%= 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 8816acb15..d0c7a8117 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -1,4 +1,4 @@ - +
  • diff --git a/app/views/users/_page.html.erb b/app/views/users/_page.html.erb index 3307c7b11..8a58a29b7 100644 --- a/app/views/users/_page.html.erb +++ b/app/views/users/_page.html.erb @@ -1,4 +1,4 @@ - + <%= form_tag do %>
    -- 2.39.5