Modify JourneyPatternsHelper#journey_name to support empty stop_points

1 files changed, 10 insertions, 7 deletions

diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb
index 4bbefbc1a..3472d90a6 100644
--- a/app/helpers/journey_patterns_helper.rb
+++ b/app/helpers/journey_patterns_helper.rb
@@ -1,15 +1,19 @@
 module JourneyPatternsHelper
 
   def journey_name( journey_pattern)
-    if journey_pattern.name.blank?
-      truncate( t('journey_patterns.journey_pattern.from_to', 
-        :departure => journey_pattern.stop_points.first.stop_area.name, 
+    unless journey_pattern.name.blank?
+      return truncate(journey_pattern.name, :length => 30)
+    end
+
+    unless journey_pattern.stop_points.empty?
+      return 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), :length => 30)
-    else
-      truncate(journey_pattern.name, :length => 30)
     end
+
+    journey_pattern.id.to_s
   end
-  
+
   def stop_point_ids_label(journey_pattern)
     return journey_pattern.human_attribute_name(:stop_point_ids) if journey_pattern.vehicle_journeys.empty?
 
@@ -30,4 +34,3 @@ module JourneyPatternsHelper
     code
   end
 end
-