diff --git a/app/views/admin/products_v3/_filters.html.haml b/app/views/admin/products_v3/_filters.html.haml index 4b90628c7c..d5d2053ee7 100644 --- a/app/views/admin/products_v3/_filters.html.haml +++ b/app/views/admin/products_v3/_filters.html.haml @@ -1,6 +1,6 @@ -= form_with url: admin_products_path, id: "filters", method: :get, data: { "search-target": "form", 'turbo-frame': "_self" } do += form_with url: admin_products_path, id: "filters", method: :get, data: { "search-target": "form", 'turbo-frame': "_self", 'turbo-action': "advance" } do = hidden_field_tag :page, nil, class: "page" - = hidden_field_tag :per_page, nil, class: "per-page" + = hidden_field_tag :per_page, params[:per_page], class: "per-page" = hidden_field_tag '[q][s]', params.dig(:q, :s) || 'name asc', class: 'sort', 'data-default': 'name asc' .query diff --git a/app/views/admin/products_v3/_sort.html.haml b/app/views/admin/products_v3/_sort.html.haml index 6749b3b07a..4cb5f29ee9 100644 --- a/app/views/admin/products_v3/_sort.html.haml +++ b/app/views/admin/products_v3/_sort.html.haml @@ -4,7 +4,7 @@ = t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to) - if search_term.present? || producer_id.present? || category_id.present? - %a{ href: url_for(page: 1), class: "button disruptive", 'data-turbo-frame': "_self" } + %a{ href: url_for(page: 1), class: "button disruptive", data: { 'turbo-frame': "_self", 'turbo-action': "advance" } } = t(".pagination.clear_search") %form.with-dropdown diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index cd1fa4cda3..e4f9febe72 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -1,4 +1,5 @@ %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"} +%meta{ name: "turbo-cache-control", content: "no-cache" } = csrf_meta_tags = action_cable_meta_tag