From 7eed44d4302f6fab559bf59045f715c2b7353745 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Fri, 26 May 2017 18:10:38 +0200
Subject: [PATCH] Use the not_archived scope in Dossier

---
 app/models/dossier.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index b38b261ca..a919aec27 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -159,7 +159,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def self.all_state order = 'ASC'
-    not_brouillon.where(archived: false).order("updated_at #{order}")
+    not_brouillon.not_archived.order("updated_at #{order}")
   end
 
   def brouillon?
@@ -172,25 +172,25 @@ class Dossier < ActiveRecord::Base
   scope :order_by_updated_at, -> (order = :desc) { order(updated_at: order) }
 
   def self.nouveaux order = 'ASC'
-    where(state: NOUVEAUX, archived: false).order("updated_at #{order}")
+    not_archived.where(state: NOUVEAUX).order("updated_at #{order}")
   end
 
   def self.waiting_for_gestionnaire order = 'ASC'
-    where(state: WAITING_FOR_GESTIONNAIRE, archived: false).order("updated_at #{order}")
+    not_archived.where(state: WAITING_FOR_GESTIONNAIRE).order("updated_at #{order}")
   end
 
   def self.waiting_for_user order = 'ASC'
-    where(state: WAITING_FOR_USER, archived: false).order("updated_at #{order}")
+    not_archived.where(state: WAITING_FOR_USER).order("updated_at #{order}")
   end
 
   scope :en_construction, -> { where(state: EN_CONSTRUCTION) }
 
   def self.ouvert order = 'ASC'
-    where(state: OUVERT, archived: false).order("updated_at #{order}")
+    not_archived.where(state: OUVERT).order("updated_at #{order}")
   end
 
   def self.a_instruire order = 'ASC'
-    where(state: A_INSTRUIRE, archived: false).order("updated_at #{order}")
+    not_archived.where(state: A_INSTRUIRE).order("updated_at #{order}")
   end
 
   scope :en_instruction, -> { where(state: EN_INSTRUCTION) }