diff options
| author | hukl <contact@smyck.org> | 2009-09-06 21:51:31 +0200 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-09-06 21:51:31 +0200 |
| commit | 8f2dc36616548650000308ebc8b1f9e2947c0ef9 (patch) | |
| tree | 79f1226c6f7646b1bbe57634c848e44d426bd01f /config | |
| parent | 5c90701cdf3ad475840a76f096f1b74ff68fbd0f (diff) | |
| parent | d555e1b27df1096e8899f2e50c8d6421f4c1cca3 (diff) | |
Merge branch 'public_search'
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index c3b2e84..1706dad 100644 --- a/config/routes.rb +++ b/config/routes.rb | |||
| @@ -18,6 +18,7 @@ ActionController::Routing::Routes.draw do |map| | |||
| 18 | map.logout '/logout', :controller => 'sessions', :action => 'destroy' | 18 | map.logout '/logout', :controller => 'sessions', :action => 'destroy' |
| 19 | map.login '/login', :controller => 'sessions', :action => 'new' | 19 | map.login '/login', :controller => 'sessions', :action => 'new' |
| 20 | map.admin_search 'admin/search', :controller => 'admin', :action => 'search' | 20 | map.admin_search 'admin/search', :controller => 'admin', :action => 'search' |
| 21 | map.search 'search', :controller => "search", :action => 'index' | ||
| 21 | map.resources :users | 22 | map.resources :users |
| 22 | map.resources :menu_items, :member => {:sort => :post} | 23 | map.resources :menu_items, :member => {:sort => :post} |
| 23 | map.resource :session | 24 | map.resource :session |
