Fix stop_area state for filter and display. Update reflex sync to use confirmed_at. Refs #6141

2 files changed, 3 insertions, 5 deletions

diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index c77500132..a71392344 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -222,7 +222,7 @@ class StopAreasController < ChouetteController
     }
 
     scope = Chouette::StopArea.where(
-      "confirmed_at #{@status[:confirmed] ? "IS NOT NULL" : "IS NULL"}
+      "confirmed_at #{(@status[:confirmed] || @status[:deactivated]) ? "IS NOT NULL" : "IS NULL"}
       AND deleted_at #{@status[:deactivated] ? "IS NOT NULL" : "IS NULL"}"
       )
 
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 79eb314bc..b49741223 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -383,11 +383,11 @@ module Chouette
     end
 
     def activated?
-      !!(deleted_at.nil? && confirmed_at)
+      deleted_at.nil? && confirmed_at
     end
 
     def deactivated?
-      !!(deleted_at && confirmed_at.nil?)
+      deleted_at.present?
     end
 
     def activate
@@ -396,7 +396,6 @@ module Chouette
     end
 
     def deactivate
-      self.confirmed_at = nil
       self.deleted_at = Time.now
     end
 
@@ -406,7 +405,6 @@ module Chouette
     end
 
     def deactivate!
-      update_attribute :confirmed_at, nil
       update_attribute :deleted_at, Time.now
     end