From 5227184b20e720d6643802b187a4c07c692283cb Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 8 Mar 2018 20:43:38 -0800
Subject: Refs #6033 Update activate and deactivate methods

---
 app/models/chouette/stop_area.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 0a27b2f39..d9d2facfe 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -383,26 +383,30 @@ module Chouette
     end
 
     def activated?
-      deleted_at.nil?
+      deleted_at.nil? && confirmed_at
     end
 
     def deactivated?
-      !activated?
+      deleted_at && confirmed_at.nil?
     end
 
     def activate
+      self.confirmed_at = Time.now
       self.deleted_at = nil
     end
 
     def deactivate
+      self.confirmed_at = nil
       self.deleted_at = Time.now
     end
 
     def activate!
+      update_attribute :confirmed_at, Time.now
       update_attribute :deleted_at, nil
     end
 
     def deactivate!
+      update_attribute :confirmed_at, nil
       update_attribute :deleted_at, Time.now
     end
 
-- 
cgit v1.2.3