X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef40b61ff40881966ae4280cfdcb9f92965e9d10..61ece2b7aef42e171e488c230cd701ab56f2c577:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index f2f27427a..90364c395 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -154,8 +154,9 @@ ActionController::Routing::Routes.draw do |map| map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/ map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/ map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss' - map.connect '/user/:display_name/diary/new', :controller => 'diary_entry', :action => 'new' map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/ + map.connect '/user/:display_name/diary/:id/hide', :controller => 'diary_entry', :action => 'hide', :id => /\d+/ + map.connect '/user/:display_name/diary/:id/hidecomment/:comment', :controller => 'diary_entry', :action => 'hidecomment', :id => /\d+/, :comment => /\d+/ map.connect '/user/:display_name/account', :controller => 'user', :action => 'account' map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home' map.connect '/user/:display_name/activate', :controller => 'user', :action => 'activate' @@ -163,11 +164,12 @@ ActionController::Routing::Routes.draw do |map| map.connect '/user/:display_name/hide', :controller => 'user', :action => 'hide' map.connect '/user/:display_name/unhide', :controller => 'user', :action => 'unhide' map.connect '/user/:display_name/delete', :controller => 'user', :action => 'delete' + map.connect '/diary/new', :controller => 'diary_entry', :action => 'new' map.connect '/diary', :controller => 'diary_entry', :action => 'list' map.connect '/diary/rss', :controller => 'diary_entry', :action => 'rss' map.connect '/diary/:language', :controller => 'diary_entry', :action => 'list' map.connect '/diary/:language/rss', :controller => 'diary_entry', :action => 'rss' - + # test pages map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate' @@ -180,9 +182,11 @@ ActionController::Routing::Routes.draw do |map| map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_uk_postcode' map.connect '/geocoder/search_ca_postcode', :controller => 'geocoder', :action => 'search_ca_postcode' map.connect '/geocoder/search_osm_namefinder', :controller => 'geocoder', :action => 'search_osm_namefinder' + map.connect '/geocoder/search_osm_nominatim', :controller => 'geocoder', :action => 'search_osm_nominatim' map.connect '/geocoder/search_geonames', :controller => 'geocoder', :action => 'search_geonames' map.connect '/geocoder/description', :controller => 'geocoder', :action => 'description' map.connect '/geocoder/description_osm_namefinder', :controller => 'geocoder', :action => 'description_osm_namefinder' + map.connect '/geocoder/description_osm_nominatim', :controller => 'geocoder', :action => 'description_osm_nominatim' map.connect '/geocoder/description_geonames', :controller => 'geocoder', :action => 'description_geonames' # export