diff options
| author | Xinhui | 2017-09-12 14:19:51 +0200 |
|---|---|---|
| committer | Xinhui | 2017-09-12 14:23:10 +0200 |
| commit | 38befb74289521600564477cdbabd53b372550a5 (patch) | |
| tree | a919479df7247a52dc727c389525c37225ccc2fa | |
| parent | 186b095684d446c21463babd33a8a03fdfb0c9d5 (diff) | |
| download | chouette-core-38befb74289521600564477cdbabd53b372550a5.tar.bz2 | |
Edit object#local_id attribute order
Refs #4453
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/route.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/routing_constraint_zone.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index 2b62d5c7f..fa2a9c8bb 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -23,7 +23,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord def local_id - "IBOO-#{self.try(:route).try(:line).try(:objectid).try(:local_id)}-#{self.referential.id}-#{self.id}" + "IBOO-#{self.referential.id}-#{self.try(:route).try(:line).try(:objectid).try(:local_id)}-#{self.id}" end def checksum_attributes diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb index 5b89fbbe8..e8c7755c7 100644 --- a/app/models/chouette/route.rb +++ b/app/models/chouette/route.rb @@ -76,7 +76,7 @@ class Chouette::Route < Chouette::TridentActiveRecord after_commit :journey_patterns_control_route_sections def local_id - "IBOO-#{self.line.objectid.local_id}-#{self.referential.id}-#{self.id}" + "IBOO-#{self.referential.id}-#{self.line.objectid.local_id}-#{self.id}" end def geometry_presenter diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb index 21efa2539..efe1b7237 100644 --- a/app/models/chouette/routing_constraint_zone.rb +++ b/app/models/chouette/routing_constraint_zone.rb @@ -9,7 +9,7 @@ class Chouette::RoutingConstraintZone < Chouette::TridentActiveRecord validate :stop_points_belong_to_route, :not_all_stop_points_selected def local_id - "IBOO-#{self.route.line.objectid.local_id}-#{self.route.objectid.local_id}-#{self.referential.id}-#{self.id}" + "IBOO-#{self.referential.id}-#{self.route.line.objectid.local_id}-#{self.route.objectid.local_id}-#{self.id}" end scope :order_by_stop_points_count, ->(direction) do diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index e60afef6e..f574afc93 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -57,7 +57,7 @@ module Chouette end def local_id - "IBOO-#{self.route.line.objectid.local_id}-#{self.referential.id}-#{self.id}" + "IBOO-#{self.referential.id}-#{self.route.line.objectid.local_id}-#{self.id}" end def checksum_attributes |
