diff options
| -rw-r--r-- | app/helpers/journey_patterns_helper.rb | 6 | ||||
| -rw-r--r-- | app/helpers/vehicle_journeys_helper.rb | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb index 6897b88c9..4bbefbc1a 100644 --- a/app/helpers/journey_patterns_helper.rb +++ b/app/helpers/journey_patterns_helper.rb @@ -1,13 +1,15 @@ module JourneyPatternsHelper + def journey_name( journey_pattern) if journey_pattern.name.blank? - t('journey_patterns.journey_pattern.from_to', + truncate( t('journey_patterns.journey_pattern.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, - :arrival => journey_pattern.stop_points.last.stop_area.name) + :arrival => journey_pattern.stop_points.last.stop_area.name), :length => 30) else truncate(journey_pattern.name, :length => 30) end end + def stop_point_ids_label(journey_pattern) return journey_pattern.human_attribute_name(:stop_point_ids) if journey_pattern.vehicle_journeys.empty? diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb index 2ee8123b5..95741f441 100644 --- a/app/helpers/vehicle_journeys_helper.rb +++ b/app/helpers/vehicle_journeys_helper.rb @@ -1,13 +1,4 @@ module VehicleJourneysHelper - def journey_name( journey_pattern) - if !journey_pattern.published_name.blank? - journey_pattern.published_name.first(8) - elsif !journey_pattern.name.blank? - journey_pattern.name.first(8) - else - journey_pattern.id - end - end def vehicle_name( vehicle) if !vehicle.published_journey_name.blank? |