diff options
| author | Luc Donnet | 2018-03-16 13:46:54 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-03-16 13:46:54 +0100 |
| commit | 193b85cc7882762d99f412b796c67f9c350172cd (patch) | |
| tree | b8fd3ea3a46b16a24936ec83ca9dd6eb12462275 /app/controllers/stop_areas_controller.rb | |
| parent | f45dbdcb2869bf98e4b3625acbd10e3835a07ea4 (diff) | |
| download | chouette-core-193b85cc7882762d99f412b796c67f9c350172cd.tar.bz2 | |
Fix stop_area state for filter and display. Update reflex sync to use confirmed_at. Refs #6141
Diffstat (limited to 'app/controllers/stop_areas_controller.rb')
| -rw-r--r-- | app/controllers/stop_areas_controller.rb | 2 |
1 files changed, 1 insertions, 1 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"}" ) |