X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6fe1a503b61cdb1216625ef71d9134b009fd3af2..cdb9d2527a8524eea02856c27fff10ad5c138344:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index ca19c9668..9d26eb0fa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,11 +44,11 @@ ActionController::Routing::Routes.draw do |map| map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine' map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine' map.connect '/traces/rss', :controller => 'trace', :action => 'georss' - map.connect '/traces/user/:display_name/', :controller => 'trace', :action => 'list', :id => nil - map.connect '/traces/user/:display_name/page/:page', :controller => 'trace', :action => 'list', :id => nil - map.connect '/traces/user/:display_name/:id', :controller => 'trace', :action => 'view', :id => nil - map.connect '/traces/user/:display_name/:id/picture', :controller => 'trace', :action => 'picture', :id => nil - map.connect '/traces/user/:display_name/:id/icon', :controller => 'trace', :action => 'icon', :id => nil + map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil + map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil + map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view', :id => nil + map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture', :id => nil + map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon', :id => nil map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list', :id => nil map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil @@ -57,5 +57,6 @@ ActionController::Routing::Routes.draw do |map| map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1 # fall through - map.connect ':controller/:action/:id' + map.connect ':controller/:id/:action' + map.connect ':controller/:action' end