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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index c576689201b5641bdf29836d7a718b7229f32790..286a53274d49193271d6a4fa81f5ce1c4be42629 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,6 +67,7 @@ OpenStreetMap::Application.routes.draw do
     get "user/:id" => "user#api_read", :id => /\d+/
     get "user/details" => "user#api_details"
     get "user/gpx_files" => "user#api_gpx_files"
     get "user/:id" => "user#api_read", :id => /\d+/
     get "user/details" => "user#api_details"
     get "user/gpx_files" => "user#api_gpx_files"

+    get "users" => "user#api_users", :as => :api_users

 
     get "user/preferences" => "user_preferences#read"
     get "user/preferences/:preference_key" => "user_preferences#read_one"
 
     get "user/preferences" => "user_preferences#read"
     get "user/preferences/:preference_key" => "user_preferences#read_one"


@@ -188,28 +189,30 @@ OpenStreetMap::Application.routes.draw do
   post "/preview/:type" => "site#preview", :as => :preview
 
   # traces
   post "/preview/:type" => "site#preview", :as => :preview
 
   # traces

-  get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#list", :page => /[1-9][0-9]*/
-  get "/user/:display_name/traces/tag/:tag" => "traces#list"
-  get "/user/:display_name/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
-  get "/user/:display_name/traces" => "traces#list"
+  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]*/
+  get "/user/:display_name/traces" => "traces#index"

   get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }

-  get "/user/:display_name/traces/:id" => "traces#view"
+  get "/user/:display_name/traces/:id" => "traces#show"

   get "/user/:display_name/traces/:id/picture" => "traces#picture"
   get "/user/:display_name/traces/:id/icon" => "traces#icon"
   get "/user/:display_name/traces/:id/picture" => "traces#picture"
   get "/user/:display_name/traces/:id/icon" => "traces#icon"

-  get "/traces/tag/:tag/page/:page" => "traces#list", :page => /[1-9][0-9]*/
-  get "/traces/tag/:tag" => "traces#list"
-  get "/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
-  get "/traces" => "traces#list"
+  get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+  get "/traces/tag/:tag" => "traces#index"
+  get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/

   get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/traces/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/traces/mine/tag/:tag/page/:page" => "traces#mine", :page => /[1-9][0-9]*/
   get "/traces/mine/tag/:tag" => "traces#mine"
   get "/traces/mine/page/:page" => "traces#mine"
   get "/traces/mine" => "traces#mine"
   get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/traces/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/traces/mine/tag/:tag/page/:page" => "traces#mine", :page => /[1-9][0-9]*/
   get "/traces/mine/tag/:tag" => "traces#mine"
   get "/traces/mine/page/:page" => "traces#mine"
   get "/traces/mine" => "traces#mine"

-  match "/trace/create" => "traces#create", :via => [:get, :post]
+  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"
   get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"

-  match "/trace/:id/edit" => "traces#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
+  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+/
 
   # diary pages
   post "/trace/:id/delete" => "traces#delete", :id => /\d+/
 
   # diary pages


@@ -261,7 +264,7 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
   get "/export/embed" => "export#embed"
 
   # messages

-  resources :messages, :only => [:show] do
+  resources :messages, :only => [:create, :show] do

     collection do
       get :inbox
       get :outbox
     collection do
       get :inbox
       get :outbox


@@ -269,7 +272,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")
   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"
   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"


@@ -295,6 +298,24 @@ OpenStreetMap::Application.routes.draw do
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
 
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
 

+  # issues and reports
+  resources :issues do
+    resources :comments, :controller => :issue_comments
+    member do
+      post "resolve"
+      post "assign"
+      post "ignore"
+      post "reopen"
+    end
+  end
+
+  resources :reports
+

   # redactions
   resources :redactions
   # redactions
   resources :redactions

+
+  # errors
+  match "/403", :to => "errors#forbidden", :via => :all
+  match "/404", :to => "errors#not_found", :via => :all
+  match "/500", :to => "errors#internal_server_error", :via => :all

 end
 end