diff options
| author | Thomas Haddad | 2017-03-09 18:06:30 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-03-09 18:06:30 +0100 |
| commit | f14fbad37c0daa0b79aaf12b234168e917b29cee (patch) | |
| tree | e5149f670c704b5cc7b11f5063bad16125d8ae5e /config | |
| parent | f4c5751a4037f52ab1d73fc201e81ba07798ecd4 (diff) | |
| parent | 3ec5c7bf65b267ce96431906feb6025cfbff347a (diff) | |
| download | chouette-core-f14fbad37c0daa0b79aaf12b234168e917b29cee.tar.bz2 | |
Merge branch '2498_vehicle_journeys'
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/vehicle_journeys.fr.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml index 9597b992c..7b3b7181f 100644 --- a/config/locales/vehicle_journeys.fr.yml +++ b/config/locales/vehicle_journeys.fr.yml @@ -55,7 +55,7 @@ fr: translation_form: "Cloner la course" journey_frequencies: "Créneau horaire" index: - title: "Horaires de la séquence d'arrêts %{route}" + title: "Horaires de '%{route}'" vehicle_journeys: "Horaires de départ aux arrêts" selection: "Filtrer sur" selection_all: "Tous" diff --git a/config/routes.rb b/config/routes.rb index 943acb5cb..33f3961b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -79,7 +79,7 @@ ChouetteIhm::Application.routes.draw do resources :autocomplete_stop_areas, only: [:show, :index] do get 'around', on: :member end - resources :autocomplete_time_tables + resources :autocomplete_time_tables, only: [:index] resources :autocomplete_route_sections resources :autocomplete_timebands resources :group_of_lines, controller: "referential_group_of_lines" do @@ -115,6 +115,7 @@ ChouetteIhm::Application.routes.draw do post 'selection' end end + resource :vehicle_journeys_collection, :only => [:show, :update] resources :vehicle_journeys, :vehicle_journey_frequencies do get 'select_journey_pattern', :on => :member resources :vehicle_translations |
