aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette/stop_area.rb
diff options
context:
space:
mode:
authorLuc Donnet2018-03-16 13:46:54 +0100
committerLuc Donnet2018-03-23 17:21:56 +0100
commit57d63b16da07b9e1ee56b6a75737b6580436e9ed (patch)
tree54b6d2412c23f3d4604149c73956d4b58339a90f /app/models/chouette/stop_area.rb
parent17383fa683459fa08e4925f9793f2d5400291f6e (diff)
downloadchouette-core-57d63b16da07b9e1ee56b6a75737b6580436e9ed.tar.bz2
Fix stop_area state for filter and display. Update reflex sync to use confirmed_at. Refs #6141
Diffstat (limited to 'app/models/chouette/stop_area.rb')
-rw-r--r--app/models/chouette/stop_area.rb6
1 files changed, 2 insertions, 4 deletions
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