X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7fef0353f25ecb02d400987ec30763d1ce881a12..584748fe0a9b20f7af5f9c6ebf127ec15b1350ad:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index f5b7e4e72..59c0dac86 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -187,22 +187,22 @@ OpenStreetMap::Application.routes.draw do match "/preview/:format" => "site#preview", :via => :post, :as => :preview # traces - match "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :via => :get + match "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ match "/user/:display_name/traces/tag/:tag" => "trace#list", :via => :get - match "/user/:display_name/traces/page/:page" => "trace#list", :via => :get + match "/user/:display_name/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ match "/user/:display_name/traces" => "trace#list", :via => :get match "/user/:display_name/traces/tag/:tag/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } match "/user/:display_name/traces/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } match "/user/:display_name/traces/:id" => "trace#view", :via => :get match "/user/:display_name/traces/:id/picture" => "trace#picture", :via => :get match "/user/:display_name/traces/:id/icon" => "trace#icon", :via => :get - match "/traces/tag/:tag/page/:page" => "trace#list", :via => :get + match "/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ match "/traces/tag/:tag" => "trace#list", :via => :get - match "/traces/page/:page" => "trace#list", :via => :get + match "/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ match "/traces" => "trace#list", :via => :get match "/traces/tag/:tag/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } match "/traces/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } - match "/traces/mine/tag/:tag/page/:page" => "trace#mine", :via => :get + match "/traces/mine/tag/:tag/page/:page" => "trace#mine", :via => :get, :page => /[1-9][0-9]*/ match "/traces/mine/tag/:tag" => "trace#mine", :via => :get match "/traces/mine/page/:page" => "trace#mine", :via => :get match "/traces/mine" => "trace#mine", :via => :get @@ -218,7 +218,7 @@ OpenStreetMap::Application.routes.draw do match "/user/:display_name/diary/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } match "/diary/:language/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } match "/diary/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } - match "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :via => :get, :page => /\d+/ + match "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :via => :get, :page => /[1-9][0-9]*/ match "/user/:display_name/diary/comments/" => "diary_entry#comments", :via => :get match "/user/:display_name/diary" => "diary_entry#list", :via => :get match "/diary/:language" => "diary_entry#list", :via => :get @@ -228,6 +228,8 @@ OpenStreetMap::Application.routes.draw do match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/ match "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :via => :post, :id => /\d+/, :as => :hide_diary_entry match "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :via => :post, :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + match "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :via => :post, :as => :diary_entry_subscribe, :id => /\d+/ + match "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :via => :post, :as => :diary_entry_unsubscribe, :id => /\d+/ # user pages match "/user/:display_name" => "user#view", :via => :get, :as => "user"