diff options
| author | Michel Etienne | 2014-11-21 08:48:49 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-11-21 08:48:49 +0100 |
| commit | f4020351027dea179270a60ef75e85fd7b905917 (patch) | |
| tree | 3fd005cdb4c30906420856cc3726b3a8f8da0479 | |
| parent | c7b7ba19222701461cfb58b3bf325a9a5d3e3fe8 (diff) | |
| download | chouette-core-f4020351027dea179270a60ef75e85fd7b905917.tar.bz2 | |
set filter on zip code instead of country code , Mantis 30115
| -rw-r--r-- | app/controllers/stop_areas_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/stop_areas/index.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb index b164f4bc8..53a7575b9 100644 --- a/app/controllers/stop_areas_controller.rb +++ b/app/controllers/stop_areas_controller.rb @@ -49,7 +49,7 @@ class StopAreasController < ChouetteController def index request.format.kml? ? @per_page = nil : @per_page = 12 - @country_codes = referential.stop_areas.collect(&:country_code).compact.uniq + @zip_codes = referential.stop_areas.collect(&:zip_code).compact.uniq index! do |format| format.html { if collection.out_of_bounds? @@ -110,9 +110,9 @@ class StopAreasController < ChouetteController redirect_to referential_stop_areas_path(@referential) end - def country_codes + def zip_codes respond_to do |format| - format.json { render :json => referential.stop_areas.collect(&:country_code).compact.uniq.to_json } + format.json { render :json => referential.stop_areas.collect(&:zip_code).compact.uniq.to_json } end end diff --git a/app/views/stop_areas/index.html.erb b/app/views/stop_areas/index.html.erb index 93406dc81..8486af7ad 100644 --- a/app/views/stop_areas/index.html.erb +++ b/app/views/stop_areas/index.html.erb @@ -20,7 +20,7 @@ <div id="advanced_search" class="panel-collapse collapse"> <div class="panel-body"> - <%= f.text_field :country_code_cont, :placeholder => "#{t('.country_code')}", :class => 'form-control typeahead' %> + <%= f.text_field :zip_code_cont, :placeholder => "#{t('.zip_code')}", :class => 'form-control typeahead' %> <%= f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { :include_blank => "#{t('.area_type')}" }, { :class => 'form-control' }) %> </div> </div> diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml index 379838f6e..1974c5cb1 100644 --- a/config/locales/stop_areas.yml +++ b/config/locales/stop_areas.yml @@ -48,7 +48,7 @@ en: index: title: "Stop areas" name: "Search by name" - country_code: "Postal Code : 78000" + zip_code: "Zip Code" selection: "Filter on" selection_all: "All" area_type: "Area Type" @@ -170,7 +170,7 @@ fr: access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien" index: name: "Recherche par nom" - country_code: "Code Postal : 78000" + zip_code: "Code Postal" title: "Arrêts" selection: "Filtrer sur" selection_all: "Tous" |