Fix stubbing of hostip requests

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 44996fd8f8f81c9609610c9eea35b18ee1a40c0c..16ba85754f3684b6ea7c5835b48694b4d4568832 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -207,7 +207,9 @@ OpenStreetMap::Application.routes.draw do
   get "/traces/mine/tag/:tag" => "traces#mine"
   get "/traces/mine/page/:page" => "traces#mine"
   get "/traces/mine" => "traces#mine"
   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]
+  resources :traces, :only => [:new, :create]
+  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"
   match "/trace/:id/edit" => "traces#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
   post "/trace/:id/delete" => "traces#delete", :id => /\d+/
   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/delete" => "traces#delete", :id => /\d+/


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

-  get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
-  get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
+  resources :messages, :only => [:show] do
+    collection do
+      get :inbox
+      get :outbox
+    end
+  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"
   match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"

-  get "/message/read/:message_id" => "messages#read", :as => "read_message"
+  get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")

   post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
   post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"

-  get "/message/reply/:message_id" => "messages#reply", :as => "reply_message"
-  post "/message/delete/:message_id" => "messages#delete", :as => "delete_message"
+  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
+  post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"

 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do
 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do


@@ -289,6 +297,19 @@ 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
 end
   # redactions
   resources :redactions
 end