From 9eaf14968fbe836886632780774f13e8c6754d2c Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 31 Jul 2019 15:09:03 +0200 Subject: [PATCH] Enable export v2 for all --- .../procedures/_download_dossiers.html.haml | 18 ++++++++---------- config/features.rb | 1 - 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/views/instructeurs/procedures/_download_dossiers.html.haml b/app/views/instructeurs/procedures/_download_dossiers.html.haml index 08e222aa7..074752555 100644 --- a/app/views/instructeurs/procedures/_download_dossiers.html.haml +++ b/app/views/instructeurs/procedures/_download_dossiers.html.haml @@ -4,18 +4,16 @@ Télécharger tous les dossiers - old_format_limit_date = Date.parse("Oct 31 2019") - export_v1_enabled = old_format_limit_date > Time.zone.today - - export_v2_enabled = Flipflop.procedure_export_v2_enabled? || !export_v1_enabled - - old_format_message = export_v1_enabled && export_v2_enabled ? "(ancien format, jusqu’au #{old_format_limit_date.strftime('%d/%m/%Y')})" : '' - .dropdown-content.fade-in-down{ style: export_v1_enabled && export_v2_enabled ? 'width: 330px' : '' } + .dropdown-content.fade-in-down{ style: !export_v1_enabled ? 'width: 330px' : '' } %ul.dropdown-items - - if export_v2_enabled - %li - = link_to "Au format .xlsx", procedure_dossiers_download_path(procedure, format: :xlsx, version: 'v2'), target: "_blank", rel: "noopener" - %li - = link_to "Au format .ods", procedure_dossiers_download_path(procedure, format: :ods, version: 'v2'), target: "_blank", rel: "noopener" - %li - = link_to "Au format .csv", procedure_dossiers_download_path(procedure, format: :csv, version: 'v2'), target: "_blank", rel: "noopener" + %li + = link_to "Au format .xlsx", procedure_dossiers_download_path(procedure, format: :xlsx, version: 'v2'), target: "_blank", rel: "noopener" + %li + = link_to "Au format .ods", procedure_dossiers_download_path(procedure, format: :ods, version: 'v2'), target: "_blank", rel: "noopener" + %li + = link_to "Au format .csv", procedure_dossiers_download_path(procedure, format: :csv, version: 'v2'), target: "_blank", rel: "noopener" - if export_v1_enabled + - old_format_message = "(ancien format, jusqu’au #{old_format_limit_date.strftime('%d/%m/%Y')})" %li = link_to "Au format .xlsx #{old_format_message}", procedure_dossiers_download_path(procedure, format: :xlsx, version: 'v1'), target: "_blank", rel: "noopener" %li diff --git a/config/features.rb b/config/features.rb index 11c9b3717..e650187ad 100644 --- a/config/features.rb +++ b/config/features.rb @@ -15,7 +15,6 @@ Flipflop.configure do feature :web_hook - feature :procedure_export_v2_enabled feature :operation_log_serialize_subject feature :download_as_zip_enabled feature :bypass_email_login_token,