Merge remote-tracking branch 'upstream/pull/5499'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 479d353463407ea17f90d4bbadf893ddcf541df3..9cb3a63edc1878dd2d126a3d0c5c2653549eb167 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,14 +66,14 @@ OpenStreetMap::Application.routes.draw do
     get "map" => "map#index"
 
     get "trackpoints" => "tracepoints#index"
-
-    get "user/:id" => "users#show", :id => /\d+/, :as => :api_user
-    get "user/details" => "users#details"
-    get "user/gpx_files" => "users#gpx_files"
-    get "users" => "users#index", :as => :api_users
   end
 
   namespace :api, :path => "api/0.6" do
+    resources :users, :only => :index
+    resources :users, :path => "user", :id => /\d+/, :only => :show
+    resources :user_traces, :path => "user/gpx_files", :module => :users, :controller => :traces, :only => :index
+    get "user/details" => "users#details"
+
     resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences" do
       collection do
         put "" => "user_preferences#update_all", :as => ""
@@ -284,7 +284,8 @@ OpenStreetMap::Application.routes.draw do
   end
 
   resource :dashboard, :only => [:show]
-  resource :preferences, :only => [:show, :edit, :update]
+  resource :preferences, :only => [:show, :update]
+  get "/preferences/edit", :to => redirect(:path => "/preferences")
   resource :profile, :only => [:edit, :update]
 
   # friendships