Solving merge V2_5 pbs

1 files changed, 7 insertions, 8 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 82dd4248f..88975b6e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,6 +37,7 @@ ChouetteIhm::Application.routes.draw do
 
   resource :organisation, :only => [:show, :edit, :update] do
     resources :users
+    resources :rule_parameter_sets
   end
 
   resources :referentials do
@@ -46,25 +47,23 @@ ChouetteIhm::Application.routes.draw do
     resources :autocomplete_time_tables
     resources :group_of_lines do
       collection do
-        get :name_filter
+        get 'name_filter'
       end
     end
-    
+
+    resources :networks
+
+    match 'lines' => 'lines#destroy_all', :via => :delete
     resources :lines do
       delete :index, on: :collection, action: :delete_all
       collection do
-        get :name_filter
+        get 'name_filter'
       end
       resources :routes do
         member do
           get 'edit_boarding_alighting'
           put 'save_boarding_alighting'
         end
-      end
-    end
-
-    resources :lines, :networks, :group_of_lines do
-      resources :routes do
         resources :journey_patterns do
           member do
             get 'new_vehicle_journey'