aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/stop_areas_controller.rb
diff options
context:
space:
mode:
authorAlban Peignier2018-03-15 09:57:53 +0100
committerAlban Peignier2018-03-15 10:10:29 +0100
commit3036b52aea082c12dec82d463936dae29643cb22 (patch)
tree5fb93f87993eacdbac52ac57325a79066ae7b171 /app/controllers/stop_areas_controller.rb
parent7cef201f206f1b95ece9b28a07b384a3fb88d7c9 (diff)
downloadchouette-core-3036b52aea082c12dec82d463936dae29643cb22.tar.bz2
Add StopArea#status in stop_areas#_form. Refs #60336033-stop-area-states
Diffstat (limited to 'app/controllers/stop_areas_controller.rb')
-rw-r--r--app/controllers/stop_areas_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index e94f64e14..c77500132 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -205,6 +205,7 @@ class StopAreasController < ChouetteController
:waiting_time,
:zip_code,
:kind,
+ :status,
localized_names: Chouette::StopArea::AVAILABLE_LOCALIZATIONS
)
end
@@ -221,7 +222,7 @@ class StopAreasController < ChouetteController
}
scope = Chouette::StopArea.where(
- "confirmed_at #{@status[:confirmed] ? "IS NOT NULL" : "IS NULL"}
+ "confirmed_at #{@status[:confirmed] ? "IS NOT NULL" : "IS NULL"}
AND deleted_at #{@status[:deactivated] ? "IS NOT NULL" : "IS NULL"}"
)