Fix autocomplete stop areas in one line Refs #0030224

2 files changed, 26 insertions, 9 deletions

diff --git a/app/views/autocomplete_stop_areas/index.rabl b/app/views/autocomplete_stop_areas/index.rabl
index 9864ff2d3..6d81442c7 100644
--- a/app/views/autocomplete_stop_areas/index.rabl
+++ b/app/views/autocomplete_stop_areas/index.rabl
@@ -1,9 +1,18 @@
 collection @stop_areas
 
 node do |stop_area|
-  { :id => stop_area.id, :stop_area_path => @options[ :stop_area_path], :registration_number => stop_area.registration_number || "", :name => stop_area.name || "", :zip_code => stop_area.zip_code || "", :city_name => stop_area.city_name || "" }
+  {
+  :id => stop_area.id,
+  :registration_number => stop_area.registration_number || "",
+  :short_registration_number => truncate(stop_area.registration_number, :length => 10) || "",
+  :name => stop_area.name || "",
+  :short_name => truncate(stop_area.name, :length => 30) || "",
+  :zip_code => stop_area.zip_code || "",
+  :city_name => stop_area.city_name || "",
+  :short_city_name => truncate(stop_area.city_name, :length => 15) || ""
+  }
 end
 
-node :area_type do |area|
-  I18n.t("area_types.label.#{area.area_type.underscore}") || ""
-end
+node(:stop_area_path) { |stop_area|
+  stop_area_picture_url(stop_area) || ""
+}
diff --git a/app/views/autocomplete_stop_areas/show.rabl b/app/views/autocomplete_stop_areas/show.rabl
index 989f6f4b1..73ce277cf 100644
--- a/app/views/autocomplete_stop_areas/show.rabl
+++ b/app/views/autocomplete_stop_areas/show.rabl
@@ -1,10 +1,18 @@
 object @stop_area
-Rails.logger.debug "inside Rabl view call helper for help_path #{self.inspect}"
 
 node do |stop_area|
-  { :id => stop_area.id, :registration_number => stop_area.registration_number || "", :image_path => @options[ :image_path ], :name => stop_area.name || "", :zip_code => stop_area.zip_code || "", :city_name => stop_area.city_name || "" }
+  {
+  :id => stop_area.id,
+  :registration_number => stop_area.registration_number || "",
+  :short_registration_number => truncate(stop_area.registration_number, :length => 10) || "",
+  :name => stop_area.name || "",
+  :short_name => truncate(stop_area.name, :length => 30) || "",
+  :zip_code => stop_area.zip_code || "",
+  :city_name => stop_area.city_name || "",
+  :short_city_name => truncate(stop_area.city_name, :length => 15) || ""
+  }
 end
 
-node :area_type do |area|
-  I18n.t("area_types.label.#{area.area_type.underscore}") || ""
-end
+node(:stop_area_path) { |stop_area|
+  stop_area_picture_url(stop_area) || ""
+}