X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10a4c5cf6e1165a9db6e9b87d0fa19d7f97b51bf..1c3e4746b0c901c19722ee6443266de325cca668:/config/routes.rb?ds=inline diff --git a/config/routes.rb b/config/routes.rb index 676afc0fb..f65042dd7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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 @@ -323,20 +327,7 @@ OpenStreetMap::Application.routes.draw do end resources :user_mutes, :only => [:index] - # oauth admin pages (i.e: for setting up new clients, etc...) - scope "/user/:display_name" do - resources :oauth_clients - end - match "/oauth/revoke" => "oauth#revoke", :via => [:get, :post] - match "/oauth/authorize" => "oauth#authorize", :via => [:get, :post], :as => :authorize - get "/oauth/token" => "oauth#token", :as => :token - match "/oauth/request_token" => "oauth#request_token", :via => [:get, :post], :as => :request_token - match "/oauth/access_token" => "oauth#access_token", :via => [:get, :post], :as => :access_token - get "/oauth/test_request" => "oauth#test_request", :as => :test_request - - # 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"