refactor table and column names

2 files changed, 14 insertions, 2 deletions

diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb
new file mode 100644
index 000000000..d7b66db06
--- /dev/null
+++ b/app/helpers/journey_patterns_helper.rb
@@ -0,0 +1,12 @@
+module JourneyPatternsHelper
+  def journey_name( journey_pattern)
+    if journey_pattern.name.blank?
+      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)
+    else
+      truncate(journey_pattern.name, :length => 30)
+    end
+  end
+end
+
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
index 72915fd2f..ab91800ae 100644
--- a/app/helpers/routes_helper.rb
+++ b/app/helpers/routes_helper.rb
@@ -1,7 +1,7 @@
 module RoutesHelper
   def line_formatted_name( line)
-    return line.publishedname if line.number.blank?
-    "#{line.publishedname} [#{line.number}]"
+    return line.published_name if line.number.blank?
+    "#{line.published_name} [#{line.number}]"
   end
 end