diff options
| author | Teddy Wing | 2017-07-20 12:21:35 +0200 | 
|---|---|---|
| committer | Teddy Wing | 2017-07-20 12:21:35 +0200 | 
| commit | 9b3778f8d2afe93486ea8e49ec7730cb1ec2be1e (patch) | |
| tree | f00016286e5af968c0b6efa3d7969cfa1dc8bdba /config/routes.rb | |
| parent | 42a51eef7d242583726c4942583b4ab567c4d293 (diff) | |
| parent | 4fd4fa0fd24c9cd86161358f2e36cff64f3712d7 (diff) | |
| download | chouette-core-9b3778f8d2afe93486ea8e49ec7730cb1ec2be1e.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 1726-WorkbenchImport-for-multi-Netex-import
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index 686c19eff..0ed401cf5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@  require 'sidekiq/web'  ChouetteIhm::Application.routes.draw do -  resources :workbenches, :only => [:show] do +  resources :workbenches, only: [:show, :index] do      delete :referentials, on: :member, action: :delete_referentials      resources :imports do        get :download, on: :member @@ -14,7 +14,7 @@ ChouetteIhm::Application.routes.draw do    devise_scope :user do      authenticated :user do -      root :to => 'referentials#index', as: :authenticated_root +      root :to => 'workbenches#index', as: :authenticated_root      end      unauthenticated :user do @@ -77,7 +77,7 @@ ChouetteIhm::Application.routes.draw do      get :autocomplete, on: :collection, controller: 'autocomplete_calendars'    end -  resources :referentials do +  resources :referentials, except: :index do      resources :api_keys      resources :autocomplete_stop_areas, only: [:show, :index] do        get 'around', on: :member @@ -214,7 +214,8 @@ ChouetteIhm::Application.routes.draw do        end      end    end -  root :to => "referentials#index" + +  root :to => "workbenches#index"    get '/help/(*slug)' => 'help#show'  | 
