Clean up diary_entry.js

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index cc86a08142812549574d40ce94408f84867b66f0..9725c0d1256707a7fd651fc505a30944b579efd9 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,7 @@ OpenStreetMap::Application.routes.draw do
   # API
   match 'api/capabilities' => 'api#capabilities', :via => :get
   match 'api/0.6/capabilities' => 'api#capabilities', :via => :get
   # API
   match 'api/capabilities' => 'api#capabilities', :via => :get
   match 'api/0.6/capabilities' => 'api#capabilities', :via => :get

+  match 'api/0.6/permissions' => 'api#permissions', :via => :get

 
   match 'api/0.6/changeset/create' => 'changeset#create', :via => :put
   match 'api/0.6/changeset/:id/upload' => 'changeset#upload', :via => :post, :id => /\d+/
 
   match 'api/0.6/changeset/create' => 'changeset#create', :via => :put
   match 'api/0.6/changeset/:id/upload' => 'changeset#upload', :via => :post, :id => /\d+/


@@ -16,6 +17,7 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/node/:id/ways' => 'way#ways_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/relations' => 'relation#relations_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/history' => 'old_node#history', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/ways' => 'way#ways_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/relations' => 'relation#relations_for_node', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id/history' => 'old_node#history', :via => :get, :id => /\d+/

+  match 'api/0.6/node/:id/:version/redact' => 'old_node#redact', :via => :post, :version => /\d+/, :id => /\d+/

   match 'api/0.6/node/:id/:version' => 'old_node#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/node/:id' => 'node#read', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id' => 'node#update', :via => :put, :id => /\d+/
   match 'api/0.6/node/:id/:version' => 'old_node#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/node/:id' => 'node#read', :via => :get, :id => /\d+/
   match 'api/0.6/node/:id' => 'node#update', :via => :put, :id => /\d+/


@@ -26,6 +28,7 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/way/:id/history' => 'old_way#history', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id/full' => 'way#full', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id/relations' => 'relation#relations_for_way', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id/history' => 'old_way#history', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id/full' => 'way#full', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id/relations' => 'relation#relations_for_way', :via => :get, :id => /\d+/

+  match 'api/0.6/way/:id/:version/redact' => 'old_way#redact', :via => :post, :version => /\d+/, :id => /\d+/

   match 'api/0.6/way/:id/:version' => 'old_way#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/way/:id' => 'way#read', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id' => 'way#update', :via => :put, :id => /\d+/
   match 'api/0.6/way/:id/:version' => 'old_way#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/way/:id' => 'way#read', :via => :get, :id => /\d+/
   match 'api/0.6/way/:id' => 'way#update', :via => :put, :id => /\d+/


@@ -36,6 +39,7 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/relation/:id/relations' => 'relation#relations_for_relation', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id/history' => 'old_relation#history', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id/full' => 'relation#full', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id/relations' => 'relation#relations_for_relation', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id/history' => 'old_relation#history', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id/full' => 'relation#full', :via => :get, :id => /\d+/

+  match 'api/0.6/relation/:id/:version/redact' => 'old_relation#redact', :via => :post, :version => /\d+/, :id => /\d+/

   match 'api/0.6/relation/:id/:version' => 'old_relation#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/relation/:id' => 'relation#read', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id' => 'relation#update', :via => :put, :id => /\d+/
   match 'api/0.6/relation/:id/:version' => 'old_relation#version', :via => :get, :id => /\d+/, :version => /\d+/
   match 'api/0.6/relation/:id' => 'relation#read', :via => :get, :id => /\d+/
   match 'api/0.6/relation/:id' => 'relation#update', :via => :put, :id => /\d+/


@@ -53,13 +57,15 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/relations/search' => 'search#search_relations', :via => :get
   match 'api/0.6/nodes/search' => 'search#search_nodes', :via => :get
 
   match 'api/0.6/relations/search' => 'search#search_relations', :via => :get
   match 'api/0.6/nodes/search' => 'search#search_nodes', :via => :get
 

+  match 'api/0.6/user/:id' => 'user#api_read', :via => :get, :id => /\d+/

   match 'api/0.6/user/details' => 'user#api_details', :via => :get
   match 'api/0.6/user/details' => 'user#api_details', :via => :get

+  match 'api/0.6/user/gpx_files' => 'user#api_gpx_files', :via => :get
+

   match 'api/0.6/user/preferences' => 'user_preference#read', :via => :get
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#read_one', :via => :get
   match 'api/0.6/user/preferences' => 'user_preference#update', :via => :put
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#update_one', :via => :put
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#delete_one', :via => :delete
   match 'api/0.6/user/preferences' => 'user_preference#read', :via => :get
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#read_one', :via => :get
   match 'api/0.6/user/preferences' => 'user_preference#update', :via => :put
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#update_one', :via => :put
   match 'api/0.6/user/preferences/:preference_key' => 'user_preference#delete_one', :via => :delete

-  match 'api/0.6/user/gpx_files' => 'user#api_gpx_files', :via => :get

 
   match 'api/0.6/gpx/create' => 'trace#api_create', :via => :post
   match 'api/0.6/gpx/:id' => 'trace#api_read', :via => :get, :id => /\d+/
 
   match 'api/0.6/gpx/create' => 'trace#api_create', :via => :post
   match 'api/0.6/gpx/:id' => 'trace#api_read', :via => :get, :id => /\d+/


@@ -85,20 +91,20 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
   match '/user/:display_name/edits' => 'changeset#list', :via => :get
   match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom
   match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
   match '/user/:display_name/edits' => 'changeset#list', :via => :get
   match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom

-  match '/browse/friends' => 'changeset#list', :via => :get, :friends => true
-  match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true
+  match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets"
+  match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets"

   match '/browse/changesets' => 'changeset#list', :via => :get
   match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom
   match '/browse' => 'changeset#list', :via => :get
 
   # web site
   match '/browse/changesets' => 'changeset#list', :via => :get
   match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom
   match '/browse' => 'changeset#list', :via => :get
 
   # web site

-  root :to => 'site#index', :via => :get
+  root :to => 'site#index', :via => [:get, :post]

   match '/edit' => 'site#edit', :via => :get
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
   match '/history' => 'changeset#list', :via => :get
   match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
   match '/edit' => 'site#edit', :via => :get
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
   match '/history' => 'changeset#list', :via => :get
   match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom

-  match '/export' => 'site#export', :via => :get
+  match '/export' => 'site#index', :export => true, :via => :get

   match '/login' => 'user#login', :via => [:get, :post]
   match '/logout' => 'user#logout', :via => [:get, :post]
   match '/offline' => 'site#offline', :via => :get
   match '/login' => 'user#login', :via => [:get, :post]
   match '/logout' => 'user#logout', :via => [:get, :post]
   match '/offline' => 'site#offline', :via => :get


@@ -122,6 +128,9 @@ OpenStreetMap::Application.routes.draw do
   # permalink
   match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/
 
   # permalink
   match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/
 

+  # rich text preview
+  match '/preview/:format' => 'site#preview', :as => :preview
+

   # traces
   match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list', :via => :get
   match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get
   # traces
   match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list', :via => :get
   match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get


@@ -144,13 +153,13 @@ OpenStreetMap::Application.routes.draw do
   match '/traces/mine' => 'trace#mine', :via => :get
   match '/trace/create' => 'trace#create', :via => [:get, :post]
   match '/trace/:id/data' => 'trace#data', :via => :get
   match '/traces/mine' => 'trace#mine', :via => :get
   match '/trace/create' => 'trace#create', :via => [:get, :post]
   match '/trace/:id/data' => 'trace#data', :via => :get

-  match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post]
+  match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :put]

   match '/trace/:id/delete' => 'trace#delete', :via => :post
 
   # diary pages
   match '/diary/new' => 'diary_entry#new', :via => [:get, :post]
   match '/trace/:id/delete' => 'trace#delete', :via => :post
 
   # diary pages
   match '/diary/new' => 'diary_entry#new', :via => [:get, :post]

-  match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get
-  match '/diary/nearby' => 'diary_entry#list', :nearby => true  , :via => :get
+  match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get, :as => "friend_diaries"
+  match '/diary/nearby' => 'diary_entry#list', :nearby => true, :via => :get, :as => "nearby_diaries"

   match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss
   match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss


@@ -162,23 +171,23 @@ OpenStreetMap::Application.routes.draw do
   match '/user/:display_name/diary/:id' => 'diary_entry#view', :via => :get, :id => /\d+/
   match '/user/:display_name/diary/:id/newcomment' => 'diary_entry#comment', :via => :post, :id => /\d+/
   match '/user/:display_name/diary/:id/edit' => 'diary_entry#edit', :via => [:get, :post], :id => /\d+/
   match '/user/:display_name/diary/:id' => 'diary_entry#view', :via => :get, :id => /\d+/
   match '/user/:display_name/diary/:id/newcomment' => 'diary_entry#comment', :via => :post, :id => /\d+/
   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+/
-  match '/user/:display_name/diary/:id/hidecomment/:comment' => 'diary_entry#hidecomment', :via => :post, :id => /\d+/, :comment => /\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

 
   # user pages
 
   # user pages

-  match '/user/:display_name' => 'user#view', :via => :get
-  match '/user/:display_name/make_friend' => 'user#make_friend', :via => :get
-  match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :get
+  match '/user/:display_name' => 'user#view', :via => :get, :as => "user"
+  match '/user/:display_name/make_friend' => 'user#make_friend', :via => [:get, :post], :as => "make_friend"
+  match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => [:get, :post], :as => "remove_friend"

   match '/user/:display_name/account' => 'user#account', :via => [:get, :post]
   match '/user/:display_name/account' => 'user#account', :via => [:get, :post]

-  match '/user/:display_name/set_status' => 'user#set_status', :via => :get
-  match '/user/:display_name/delete' => 'user#delete', :via => :get
+  match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user
+  match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user

 
   # user lists
   match '/users' => 'user#list', :via => [:get, :post]
   match '/users/:status' => 'user#list', :via => [:get, :post]
 
   # geocoder
 
   # user lists
   match '/users' => 'user#list', :via => [:get, :post]
   match '/users/:status' => 'user#list', :via => [:get, :post]
 
   # geocoder

-  match '/geocoder/search' => 'geocoder#search', :via => :get
+  match '/geocoder/search' => 'geocoder#search', :via => :post

   match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get
   match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get
   match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get
   match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get
   match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get
   match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get


@@ -186,7 +195,7 @@ OpenStreetMap::Application.routes.draw do
   match '/geocoder/search_osm_namefinder' => 'geocoder#search_osm_namefinder', :via => :get
   match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get
   match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get
   match '/geocoder/search_osm_namefinder' => 'geocoder#search_osm_namefinder', :via => :get
   match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get
   match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get

-  match '/geocoder/description' => 'geocoder#description', :via => :get
+  match '/geocoder/description' => 'geocoder#description', :via => :post

   match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get
   match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get
   match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get
   match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get
   match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get
   match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get


@@ -196,13 +205,13 @@ OpenStreetMap::Application.routes.draw do
   match '/export/finish' => 'export#finish', :via => :post
 
   # messages
   match '/export/finish' => 'export#finish', :via => :post
 
   # messages

-  match '/user/:display_name/inbox' => 'message#inbox', :via => :get
-  match '/user/:display_name/outbox' => 'message#outbox', :via => :get
-  match '/message/new/:display_name' => 'message#new', :via => [:get, :post]
-  match '/message/read/:message_id' => 'message#read', :via => :get
-  match '/message/mark/:message_id' => 'message#mark', :via => :post
-  match '/message/reply/:message_id' => 'message#reply', :via => :get
-  match '/message/delete/:message_id' => 'message#delete', :via => :post
+  match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox"
+  match '/user/:display_name/outbox' => 'message#outbox', :via => :get, :as => "outbox"
+  match '/message/new/:display_name' => 'message#new', :via => [:get, :post], :as => "new_message"
+  match '/message/read/:message_id' => 'message#read', :via => :get, :as => "read_message"
+  match '/message/mark/:message_id' => 'message#mark', :via => :post, :as => "mark_message"
+  match '/message/reply/:message_id' => 'message#reply', :via => [:get, :post], :as => "reply_message"
+  match '/message/delete/:message_id' => 'message#delete', :via => :post, :as => "delete_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


@@ -216,11 +225,14 @@ OpenStreetMap::Application.routes.draw do
   match '/oauth/test_request' => 'oauth#test_request', :as => :test_request
 
   # roles and banning pages
   match '/oauth/test_request' => 'oauth#test_request', :as => :test_request
 
   # roles and banning pages

-  match '/user/:display_name/role/:role/grant' => 'user_roles#grant', :via => [:get, :post]
-  match '/user/:display_name/role/:role/revoke' => 'user_roles#revoke', :via => [:get, :post]
+  match '/user/:display_name/role/:role/grant' => 'user_roles#grant', :via => :post, :as => "grant_role"
+  match '/user/:display_name/role/:role/revoke' => 'user_roles#revoke', :via => :post, :as => "revoke_role"

   match '/user/:display_name/blocks' => 'user_blocks#blocks_on', :via => :get
   match '/user/:display_name/blocks_by' => 'user_blocks#blocks_by', :via => :get
   match '/user/:display_name/blocks' => 'user_blocks#blocks_on', :via => :get
   match '/user/:display_name/blocks_by' => 'user_blocks#blocks_by', :via => :get

-  match '/blocks/new/:display_name' => 'user_blocks#new', :via => :get
+  match '/blocks/new/:display_name' => 'user_blocks#new', :via => :get, :as => "new_user_block"

   resources :user_blocks
   resources :user_blocks

-  match '/blocks/:id/revoke' => 'user_blocks#revoke', :via => [:get, :post]
+  match '/blocks/:id/revoke' => 'user_blocks#revoke', :via => [:get, :post], :as => "revoke_user_block"
+
+  # redactions
+  resources :redactions

 end
 end