fix: remove brouillon from repousser_expiration

demarches-simplifiees · Dec 9, 2023 · 96adffb · 96adffb
1 parent 8c1bc9e
commit 96adffb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/app/components/dossiers/batch_operation_component.rb b/app/components/dossiers/batch_operation_component.rb
@@ -12,8 +12,6 @@ def render?
 
   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
@@ -58,7 +58,7 @@ def dossiers_safe_scope(dossier_ids = self.dossier_ids)
     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