X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0089f0ce81ef10ca7ed43969d83d8b77014fa11..a0dc300840c236d6460c0641f8a9f47246815ad1:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index e912871e4..16c05fea5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -189,6 +189,7 @@ OpenStreetMap::Application.routes.draw do post "/preview/:type" => "site#preview", :as => :preview # traces + resources :traces, :except => [:show] get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/ get "/user/:display_name/traces/tag/:tag" => "traces#index" get "/user/:display_name/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/ @@ -207,11 +208,8 @@ OpenStreetMap::Application.routes.draw do get "/traces/mine/tag/:tag" => "traces#mine" get "/traces/mine/page/:page" => "traces#mine" get "/traces/mine" => "traces#mine" - resources :traces, :only => [:index, :new, :create, :edit, :update] - post "/trace/create" => "traces#create" # remove after deployment get "/trace/create", :to => redirect(:path => "/traces/new") get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data" - post "trace/:id/edit" => "traces#update" # remove after deployment get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit") post "/trace/:id/delete" => "traces#delete", :id => /\d+/ @@ -236,7 +234,7 @@ OpenStreetMap::Application.routes.draw do post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/ # user pages - get "/user/:display_name" => "user#view", :as => "user" + get "/user/:display_name" => "user#show", :as => "user" match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend" match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend" match "/user/:display_name/account" => "user#account", :via => [:get, :post] @@ -264,7 +262,7 @@ OpenStreetMap::Application.routes.draw do get "/export/embed" => "export#embed" # messages - resources :messages, :only => [:show] do + resources :messages, :only => [:create, :show] do collection do get :inbox get :outbox @@ -272,7 +270,7 @@ OpenStreetMap::Application.routes.draw do end get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox") get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox") - match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message" + get "/message/new/:display_name" => "messages#new", :as => "new_message" get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}") post "/message/mark/:message_id" => "messages#mark", :as => "mark_message" match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"