aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorZog2018-01-26 16:17:22 +0100
committercedricnjanga2018-02-07 07:24:32 -0800
commitcb1c6c42cf0f053d52a08cb8ccdbb70a142ec5ad (patch)
treefde2e364e7b836a4bad40e33b8c2d97c7c9e5558 /app/models
parente46fde25ca2ed406b215471404be21ef1e617f8d (diff)
downloadchouette-core-cb1c6c42cf0f053d52a08cb8ccdbb70a142ec5ad.tar.bz2
Refs #5750 @1h; Add a "kind" attribute to StopAreas
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
Diffstat (limited to 'app/models')
-rw-r--r--app/models/chouette/stop_area.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index bb8747faa..69aed144b 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -11,8 +11,11 @@ module Chouette
extend Enumerize
enumerize :area_type, in: Chouette::AreaType::ALL
enumerize :kind, in: %i(commercial non_commercial)
+<<<<<<< HEAD
AVAILABLE_LOCALIZATIONS = %i(gb nl de fr it es)
+=======
+>>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas
with_options dependent: :destroy do |assoc|
assoc.has_many :stop_points