diff options
| author | Edouard Maffert | 2016-09-09 14:48:40 +0200 | 
|---|---|---|
| committer | Edouard Maffert | 2016-09-09 14:48:40 +0200 | 
| commit | 4747990c6d3ceb5020d06099d086500b066db6e4 (patch) | |
| tree | 1a2edc21344b1ed67a2a2d91affd522d533b3732 /config/routes.rb | |
| parent | ec8233bf59eed3edbdcf6ebf3b8812ec3d7f7ee7 (diff) | |
| parent | bb12088efba8d755bf29d2edb0309b59953e14f5 (diff) | |
| download | chouette-core-4747990c6d3ceb5020d06099d086500b066db6e4.tar.bz2 | |
Merge branch 'companies_line_referential_association'
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 25c3d4838..1cd809c59 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,6 +58,7 @@ ChouetteIhm::Application.routes.draw do    resources :line_referentials, :only => [:show, :edit, :update] do      resources :lines      resources :group_of_lines +    resources :companies    end    resources :referentials do @@ -148,7 +149,7 @@ ChouetteIhm::Application.routes.draw do        end      end -    resources :companies +    resources :companies, controller: "referential_companies"      resources :time_tables do        collection do  | 
