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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 54bf037cf293984488572a901710283a02d9222b..67991b251a7238277944216cf47accdcae92d546 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,15 +29,11 @@ OpenStreetMap::Application.routes.draw do
     post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/
     post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
     post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/
     post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/
     post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
     post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/

-
-    post "node/:node_id/:version/redact" => "old_nodes#redact", :as => :node_version_redact, :version => /\d+/, :node_id => /\d+/
-
-    post "way/:way_id/:version/redact" => "old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/
-
-    post "relation/:relation_id/:version/redact" => "old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/

   end
 
   namespace :api, :path => "api/0.6" do
   end
 
   namespace :api, :path => "api/0.6" do

+    resources :changeset_comments, :only => :index
+

     resources :nodes, :only => [:index, :create]
     resources :nodes, :path => "node", :id => /\d+/, :only => [:show, :update, :destroy] do
       scope :module => :nodes do
     resources :nodes, :only => [:index, :create]
     resources :nodes, :path => "node", :id => /\d+/, :only => [:show, :update, :destroy] do
       scope :module => :nodes do


@@ -45,9 +41,12 @@ OpenStreetMap::Application.routes.draw do
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_nodes, :only => :index
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_nodes, :only => :index

-      resources :versions, :path => "", :version => /\d+/, :param => :version, :controller => :old_nodes, :only => :show
+      resource :version, :path => ":version", :version => /\d+/, :controller => :old_nodes, :only => :show do
+        resource :redaction, :module => :old_nodes, :only => [:create, :destroy]
+      end

     end
     put "node/create" => "nodes#create", :as => nil
     end
     put "node/create" => "nodes#create", :as => nil

+    post "node/:node_id/:version/redact" => "old_nodes/redactions#create", :node_id => /\d+/, :version => /\d+/, :allow_delete => true, :as => nil

 
     resources :ways, :only => [:index, :create]
     resources :ways, :path => "way", :id => /\d+/, :only => [:show, :update, :destroy] do
 
     resources :ways, :only => [:index, :create]
     resources :ways, :path => "way", :id => /\d+/, :only => [:show, :update, :destroy] do


@@ -58,9 +57,12 @@ OpenStreetMap::Application.routes.draw do
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_ways, :only => :index
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_ways, :only => :index

-      resources :versions, :path => "", :version => /\d+/, :param => :version, :controller => :old_ways, :only => :show
+      resource :version, :path => ":version", :version => /\d+/, :controller => :old_ways, :only => :show do
+        resource :redaction, :module => :old_ways, :only => [:create, :destroy]
+      end

     end
     put "way/create" => "ways#create", :as => nil
     end
     put "way/create" => "ways#create", :as => nil

+    post "way/:way_id/:version/redact" => "old_ways/redactions#create", :way_id => /\d+/, :version => /\d+/, :allow_delete => true, :as => nil

 
     resources :relations, :only => [:index, :create]
     resources :relations, :path => "relation", :id => /\d+/, :only => [:show, :update, :destroy] do
 
     resources :relations, :only => [:index, :create]
     resources :relations, :path => "relation", :id => /\d+/, :only => [:show, :update, :destroy] do


@@ -71,9 +73,12 @@ OpenStreetMap::Application.routes.draw do
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_relations, :only => :index
         resources :relations, :only => :index
       end
       resources :versions, :path => "history", :controller => :old_relations, :only => :index

-      resources :versions, :path => "", :version => /\d+/, :param => :version, :controller => :old_relations, :only => :show
+      resource :version, :path => ":version", :version => /\d+/, :controller => :old_relations, :only => :show do
+        resource :redaction, :module => :old_relations, :only => [:create, :destroy]
+      end

     end
     put "relation/create" => "relations#create", :as => nil
     end
     put "relation/create" => "relations#create", :as => nil

+    post "relation/:relation_id/:version/redact" => "old_relations/redactions#create", :relation_id => /\d+/, :version => /\d+/, :allow_delete => true, :as => nil

 
     resource :map, :only => :show
 
 
     resource :map, :only => :show
 


@@ -121,7 +126,10 @@ OpenStreetMap::Application.routes.draw do
       resource :subscription, :only => [:create, :destroy], :controller => "note_subscriptions"
     end
 
       resource :subscription, :only => [:create, :destroy], :controller => "note_subscriptions"
     end
 

-    resources :user_blocks, :only => :show, :id => /\d+/, :controller => "user_blocks"
+    resources :user_blocks, :only => [:show, :create], :id => /\d+/, :controller => "user_blocks"
+    namespace :user_blocks, :path => "user/blocks" do
+      resource :active_list, :path => "active", :only => :show
+    end

   end
 
   # Data browsing
   end
 
   # Data browsing


@@ -289,15 +297,18 @@ OpenStreetMap::Application.routes.draw do
       resource :status, :only => :update
     end
   end
       resource :status, :only => :update
     end
   end

-  get "/user/:display_name/account", :to => redirect(:path => "/account/edit")
+  get "/user/:display_name/account", :to => redirect(:path => "/account")

   get "/user/:display_name/diary/comments(/:page)", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary_comments")
 
   get "/user/:display_name/diary/comments(/:page)", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary_comments")
 

-  resource :account, :only => [:edit, :update, :destroy] do
+  resource :account, :only => [:show, :update, :destroy] do

     scope :module => :accounts do
       resource :terms, :only => [:show, :update]
     scope :module => :accounts do
       resource :terms, :only => [:show, :update]

+      resource :pd_declaration, :only => [:show, :create]

       resource :deletion, :only => :show
       resource :deletion, :only => :show

+      resource :home, :only => :show

     end
   end
     end
   end

+  get "/account/edit", :to => redirect(:path => "/account"), :as => nil

 
   resource :dashboard, :only => [:show]
   resource :preferences, :only => [:show, :update]
 
   resource :dashboard, :only => [:show]
   resource :preferences, :only => [:show, :update]