Merge branch 'mission_redux'

3 files changed, 4 insertions, 3 deletions

diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index 856dd6d15..b11c59bb1 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -11,6 +11,7 @@ en:
       destroy: "Remove this journey pattern"
       destroy_confirm: A"re you sure you want destroy this journey pattern ?"
       edit_route_sections: "Update route sections"
+      edit_journey_patterns_collection: "Edit journey patterns"
     new:
       title: "Add a new journey pattern"
     edit:
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 78860514a..83e77e474 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -11,6 +11,7 @@ fr:
       destroy: "Supprimer cette mission"
       destroy_confirm: "Etes vous sûr de vouloir détruire cette mission ?"
       edit_route_sections: "Modifier les sections de parcours"
+      edit_journey_patterns_collection: "Modifier les missions"
     new:
       title: "Ajouter une mission"
     edit:
diff --git a/config/routes.rb b/config/routes.rb
index c49b28a07..9d4141198 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,10 +99,9 @@ ChouetteIhm::Application.routes.draw do
           get 'edit_boarding_alighting'
           put 'save_boarding_alighting'
         end
+        resource :journey_patterns_collection, :only => [:show, :update]
         resources :journey_patterns do
-          member do
-            get 'new_vehicle_journey'
-          end
+          get 'new_vehicle_journey', on: :member
           resource :route_sections_selector, path: 'sections' do
             post 'selection'
           end