Marge all the changeset list methods together into one.

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 1b5d483c6c686e9b8f91f833b8cddd79421a4dc6..68f1ad6d25b57d9ac9d67a1c6ff5fda2451bc2ac 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,7 +73,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'
   
   # Data browsing
-  map.connect '/browse', :controller => 'changeset', :action => 'list'
+  map.connect '/browse', :controller => 'changeset', :action => 'list', :format => 'rhtml'
   map.connect '/browse/start', :controller => 'browse', :action => 'start'
   map.connect '/browse/way/:id', :controller => 'browse', :action => 'way', :id => /\d+/
   map.connect '/browse/way/:id/history', :controller => 'browse', :action => 'way_history', :id => /\d+/
@@ -89,8 +89,8 @@ ActionController::Routing::Routes.draw do |map|
   map.root :controller => 'site', :action => 'index'
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
-  map.connect '/history', :controller => 'changeset', :action => 'list_bbox', :format => 'rhtml'
-  map.connect '/history/rss', :controller => 'changeset', :action => 'list_bbox', :format => 'rxml'
+  map.connect '/history', :controller => 'changeset', :action => 'list', :format => 'rhtml'
+  map.connect '/history/rss', :controller => 'changeset', :action => 'list', :format => 'rxml'
   map.connect '/export', :controller => 'site', :action => 'export'
   map.connect '/login', :controller => 'user', :action => 'login'
   map.connect '/logout', :controller => 'user', :action => 'logout'
@@ -144,8 +144,8 @@ ActionController::Routing::Routes.draw do |map|
 
   # user pages
   map.connect '/user/:display_name', :controller => 'user', :action => 'view'
-  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list_user', :format => 'rhtml'
-  map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list_user', :format => 'rxml'
+  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list', :format => 'rhtml'
+  map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list', :format => 'rxml'
   map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
   map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
   map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'