aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-08-21 14:55:08 +0200
committerLuc Donnet2014-08-21 14:55:08 +0200
commit310fa69dfc13bba40065885dfe4745db91e1ee94 (patch)
treebcf8ff8ad8569f03b5a529fd203f49d77fa23a1f
parentc5b3643f8e2093c34a8db320a8239887296a8ff6 (diff)
downloadchouette-core-310fa69dfc13bba40065885dfe4745db91e1ee94.tar.bz2
Add area_type for stop_area search
-rw-r--r--app/controllers/connection_link_areas_controller.rb4
-rw-r--r--app/inputs/search_stop_area_input.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/connection_link_areas_controller.rb b/app/controllers/connection_link_areas_controller.rb
index 95b963b6b..eceb1b0fc 100644
--- a/app/controllers/connection_link_areas_controller.rb
+++ b/app/controllers/connection_link_areas_controller.rb
@@ -15,8 +15,8 @@ class ConnectionLinkAreasController < ChouetteController
:country_code => area.country_code,
:zip_code => area.zip_code || "",
:city_name => area.city_name || "",
- :area_type => area.area_type
- }
+ :area_type => t("area_types.label.#{area.area_type.underscore}")
+ }
end
end
diff --git a/app/inputs/search_stop_area_input.rb b/app/inputs/search_stop_area_input.rb
index 992a08b85..e51b31bf8 100644
--- a/app/inputs/search_stop_area_input.rb
+++ b/app/inputs/search_stop_area_input.rb
@@ -11,7 +11,7 @@ class SearchStopAreaInput < Formtastic::Inputs::SearchInput
hintText: '#{options[:hint_text]}',
noResultsText: '#{options[:no_result_text]}',
searchingText: '#{options[:searching_text]}',
- resultsFormatter: function(item){ return '<li><div class=\"name\">' + item.name + '</div><div class=\"info\">' + item.zip_code + ' ' + item.city_name + '</div></li>' },
+ resultsFormatter: function(item){ return '<li><div class=\"name\">' + item.name + '</div><div class=\"info\">' + item.area_type + '</div><div class=\"info\">' + item.zip_code + ' ' + item.city_name + '</div></li>' },
tokenFormatter: function(item) { return '<li><p>' + item.name + '</p></li>' }
});
});").html_safe)