X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/563871c5a9a8140522b0c569df5c91a38528c8ce..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/config/routes.rb?ds=sidebyside diff --git a/config/routes.rb b/config/routes.rb index 22c4ad642..89e636409 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -77,25 +77,25 @@ OpenStreetMap::Application.routes.draw do put "" => "user_preferences#update_all", :as => "" end end + end - resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do + namespace :api, :path => "api/0.6" do + resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do collection do get "inbox" get "outbox" end end + post "/user/messages/:id" => "messages#update" - post "/user/messages/:id" => "messages#update", :as => :api_message_update - - post "gpx/create" => "traces#create" - get "gpx/:id" => "traces#show", :as => :api_trace, :id => /\d+/ - put "gpx/:id" => "traces#update", :id => /\d+/ - delete "gpx/:id" => "traces#destroy", :id => /\d+/ - get "gpx/:id/details" => "traces#show", :id => /\d+/ - get "gpx/:id/data" => "traces#data", :as => :api_trace_data - end + resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do + scope :module => :traces do + resource :data, :only => :show + end + end + post "gpx/create" => "traces#create", :id => /\d+/, :as => :trace_create + get "gpx/:id/details" => "traces#show", :id => /\d+/, :as => :trace_details - namespace :api, :path => "api/0.6" do # Map notes API resources :notes, :except => [:new, :edit, :update], :id => /\d+/, :controller => "notes" do collection do @@ -108,6 +108,8 @@ OpenStreetMap::Application.routes.draw do post "close" post "reopen" end + + resource :subscription, :only => [:create, :destroy], :controller => "note_subscriptions" end resources :user_blocks, :only => :show, :id => /\d+/, :controller => "user_blocks" @@ -266,7 +268,9 @@ OpenStreetMap::Application.routes.draw do post "/diary_comments/:comment/unhide" => "diary_comments#unhide", :comment => /\d+/, :as => :unhide_diary_comment # user pages - resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy] + resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy] do + resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy] + end get "/user/:display_name/account", :to => redirect(:path => "/account/edit") post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user @@ -284,8 +288,9 @@ OpenStreetMap::Application.routes.draw do match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend" # user lists - match "/users" => "users#index", :via => [:get, :post] - match "/users/:status" => "users#index", :via => [:get, :post] + namespace :users do + resource :list, :path => "(:status)", :only => [:show, :update] + end # geocoder get "/search" => "geocoder#search" @@ -323,9 +328,7 @@ OpenStreetMap::Application.routes.draw do end resources :user_mutes, :only => [:index] - # roles and banning pages - post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role" - post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role" + # banning pages get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by" get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"