From 022cd6cf73aca2f1e30069f17d0accc75446ad89 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 11 Dec 2024 09:51:53 +0100 Subject: [PATCH] [#11103] Fixes after review --- app/components/dossiers/export_dropdown_component.rb | 2 +- .../export_dropdown_component.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/dossiers/export_dropdown_component.rb b/app/components/dossiers/export_dropdown_component.rb index 2bbba3ca5..928cd35fe 100644 --- a/app/components/dossiers/export_dropdown_component.rb +++ b/app/components/dossiers/export_dropdown_component.rb @@ -31,7 +31,7 @@ class Dossiers::ExportDropdownComponent < ApplicationComponent end def can_include_archived? - @statut == 'tous' + @statut == 'tous' && @archived_count > 0 end def include_archived_title diff --git a/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml b/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml index a4387fcab..ad1962f28 100644 --- a/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml +++ b/app/components/dossiers/export_dropdown_component/export_dropdown_component.html.haml @@ -16,7 +16,7 @@ .fr-tabs__panel.fr-pb-8w.fr-tabs__panel--selected{ id: "tabpanel-standard#{@count}-panel", role: "tabpanel", "aria-labelledby": "tabpanel-standard#{@count}", tabindex: "0" } = form_with url: download_export_path, namespace: "export#{@count}", data: { turbo_method: :post, turbo: true } do |f| - - if can_include_archived? && @archived_count > 0 + - if can_include_archived? .fr-pb-2w = render Dsfr::ToggleComponent.new(form: f, target: :include_archived, @@ -64,7 +64,7 @@ .fr-tabs__panel.fr-pr-3w.fr-pb-8w{ id: "tabpanel-template#{@count}-panel", role: "tabpanel", "aria-labelledby": "tabpanel-template", tabindex: "0" } = form_with url: download_export_path, namespace: "export_template_#{@count}", data: { turbo_method: :post, turbo: true } do |f| = f.hidden_field :statut, value: @statut - - if can_include_archived? && @archived_count > 0 + - if can_include_archived? .fr-pb-2w = render Dsfr::ToggleComponent.new(form: f, target: :include_archived,