diff options
Diffstat (limited to 'app/models/chouette/route.rb')
| -rw-r--r-- | app/models/chouette/route.rb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb index 6794ba3e4..be86b5b04 100644 --- a/app/models/chouette/route.rb +++ b/app/models/chouette/route.rb @@ -76,20 +76,19 @@ module Chouette validates :wayback, inclusion: { in: self.wayback.values } - after_commit :journey_patterns_control_route_sections - - def duplicate - overrides = { - 'opposite_route_id' => nil - } - keys_for_create = attributes.keys - %w{id objectid created_at updated_at} - atts_for_create = attributes - .slice(*keys_for_create) - .merge(overrides) - new_route = self.class.create!(atts_for_create) - duplicate_stop_points(for_route: new_route) - new_route - end + def duplicate + overrides = { + 'opposite_route_id' => nil, + 'name' => I18n.t('activerecord.copy', name: self.name) + } + keys_for_create = attributes.keys - %w{id objectid created_at updated_at} + atts_for_create = attributes + .slice(*keys_for_create) + .merge(overrides) + new_route = self.class.create!(atts_for_create) + duplicate_stop_points(for_route: new_route) + new_route + end def duplicate_stop_points(for_route:) stop_points.each(&duplicate_stop_point(for_route: for_route)) @@ -192,9 +191,13 @@ module Chouette protected +<<<<<<< HEAD def self.vehicle_journeys_timeless(stop_point_id) all( :conditions => ['vehicle_journeys.id NOT IN (?)', Chouette::VehicleJourneyAtStop.where(stop_point_id: stop_point_id).pluck(:vehicle_journey_id)] ) end +======= + protected +>>>>>>> master end end
\ No newline at end of file |