diff options
| author | Thomas Haddad | 2017-01-04 11:10:15 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-01-04 11:10:15 +0100 |
| commit | 9c08e8f9f42906f9be17a8fbce7fcd83dbd51179 (patch) | |
| tree | 65e132910ffadab7534f4b5ad2257539f06b309b /app/models | |
| parent | 9560056852d1d48767c5ed150bce4e3abffcca00 (diff) | |
| parent | 66dc68487a6e8a826ec4d4ffcee2f34456488dea (diff) | |
| download | chouette-core-9c08e8f9f42906f9be17a8fbce7fcd83dbd51179.tar.bz2 | |
Merge branch 'mission_redux'
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index 9b2b2a9da..75e1a4a14 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -7,6 +7,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord has_many :vehicle_journeys, :dependent => :destroy has_many :vehicle_journey_at_stops, :through => :vehicle_journeys has_and_belongs_to_many :stop_points, -> { order("stop_points.position") }, :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove + has_many :stop_areas, through: :stop_points has_many :journey_pattern_sections has_many :route_sections, through: :journey_pattern_sections, dependent: :destroy |