From 96adffb5f57a8b9751dcef1a1fa1786aca72ebd8 Mon Sep 17 00:00:00 2001 From: seb-by-ouidou Date: Wed, 6 Dec 2023 13:55:54 +0000 Subject: [PATCH] fix: remove brouillon from repousser_expiration --- app/components/dossiers/batch_operation_component.rb | 2 -- app/models/batch_operation.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/components/dossiers/batch_operation_component.rb b/app/components/dossiers/batch_operation_component.rb index ee76d1472..7f090feaa 100644 --- a/app/components/dossiers/batch_operation_component.rb +++ b/app/components/dossiers/batch_operation_component.rb @@ -12,8 +12,6 @@ class Dossiers::BatchOperationComponent < ApplicationComponent def operations_for_dossier(dossier) case dossier.state - when Dossier.states.fetch(:brouillon) - [BatchOperation.operations.fetch(:repousser_expiration)] when Dossier.states.fetch(:en_construction) [BatchOperation.operations.fetch(:passer_en_instruction), BatchOperation.operations.fetch(:repousser_expiration)] when Dossier.states.fetch(:en_instruction) diff --git a/app/models/batch_operation.rb b/app/models/batch_operation.rb index 76a9b05a2..07e3c113d 100644 --- a/app/models/batch_operation.rb +++ b/app/models/batch_operation.rb @@ -58,7 +58,7 @@ class BatchOperation < ApplicationRecord when BatchOperation.operations.fetch(:follow) then query.visible_by_administration.without_followers.en_cours when BatchOperation.operations.fetch(:repousser_expiration) then - query.visible_by_administration.close_to_expiration + query.visible_by_administration.termine_or_en_construction_close_to_expiration when BatchOperation.operations.fetch(:repasser_en_construction) then query.visible_by_administration.state_en_instruction when BatchOperation.operations.fetch(:unfollow) then