diff options
| -rw-r--r-- | app/models/chouette/routing_constraint_zone.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 2 | ||||
| -rw-r--r-- | app/views/companies/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/companies/show.html.slim | 2 | ||||
| -rw-r--r-- | app/views/time_tables/show.rabl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb index 0691ef688..d4ba8b94b 100644 --- a/app/models/chouette/routing_constraint_zone.rb +++ b/app/models/chouette/routing_constraint_zone.rb @@ -11,7 +11,7 @@ module Chouette validate :stop_points_belong_to_route, :not_all_stop_points_selected def local_id - "IBOO-#{self.referential.id}-#{self.route.line.objectid.local_id}-#{self.route.objectid.local_id}-#{self.id}" + "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.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 b68909795..c8754e958 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -65,7 +65,7 @@ module Chouette [].tap do |attrs| attrs << self.published_journey_name attrs << self.published_journey_identifier - attrs << self.try(:company).try(:objectid).try(:local_id) + attrs << self.try(:company).try(:get_objectid).try(:local_id) attrs << self.footnotes.map(&:checksum).sort attrs << self.vehicle_journey_at_stops.map(&:checksum).sort end diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim index ba061f505..942924e73 100644 --- a/app/views/companies/index.html.slim +++ b/app/views/companies/index.html.slim @@ -27,7 +27,7 @@ [ \ TableBuilderHelper::Column.new( \ name: 'Oid', \ - attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \ + attribute: Proc.new { |n| n.try(:get_objectid).try(:local_id) }, \ sortable: false \ ), \ TableBuilderHelper::Column.new( \ diff --git a/app/views/companies/show.html.slim b/app/views/companies/show.html.slim index 668226938..4219595b8 100644 --- a/app/views/companies/show.html.slim +++ b/app/views/companies/show.html.slim @@ -23,7 +23,7 @@ .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), - { 'ID Codif' => @company.try(:objectid).try(:local_id), + { 'ID Codif' => @company.try(:get_objectid).try(:local_id), Chouette::Company.human_attribute_name(:phone) => @company.phone, Chouette::Company.human_attribute_name(:email) => @company.email, Chouette::Company.human_attribute_name(:url) => @company.url } diff --git a/app/views/time_tables/show.rabl b/app/views/time_tables/show.rabl index 53c9daec0..55744bf8c 100644 --- a/app/views/time_tables/show.rabl +++ b/app/views/time_tables/show.rabl @@ -10,7 +10,7 @@ node do |tt| periode_range: month_periode_enum(3), current_periode_range: Date.today.beginning_of_month, color: tt.color ? tt.color : '', - short_id: tt.objectid.parts.try(:third) + short_id: tt.get_objectid.short_id } end |