Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths

Use shallow routes for diary comments

diff --combined config/routes.rb
index b0e23301e998bd42e7f945df18b22357f9057021,a5e1240f6c41481f64af00732f24aebb86ce0f6b..e2fd2871bf74c13288252e91f7e05bae7f2f542b
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -246,17 -246,15 +246,17 @@@ OpenStreetMap::Application.routes.draw 
    get "/user/:display_name/diary" => "diary_entries#index"
    get "/diary/:language" => "diary_entries#index"
    scope "/user/:display_name" do
 -    resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/
 +    resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/ do
 +      member do
 +        post :hide, :unhide
 +      end
 +    end
    end
 -  post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry
 -  post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry
    match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/
    match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/
    post "/user/:display_name/diary/:id/comments" => "diary_comments#create", :id => /\d+/, :as => :comment_diary_entry
-   post "/user/:display_name/diary/:id/comments/:comment/hide" => "diary_comments#hide", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
-   post "/user/:display_name/diary/:id/comments/:comment/unhide" => "diary_comments#unhide", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment
+   post "/diary_comments/:comment/hide" => "diary_comments#hide", :comment => /\d+/, :as => :hide_diary_comment
+   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]
@@@ -333,7 -331,8 +333,7 @@@
    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"
 -  resources :user_blocks
 -  match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
 +  resources :user_blocks, :except => :new
    match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks"
  
    # issues and reports