diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-08-28 15:43:46 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-08-28 15:43:46 +0100 |
| commit | d801fff4325a42f1bbbb273ac0a4597c32b4dd4b (patch) | |
| tree | 5b9d4828b2c6bf8415ccabb0140eb730ed12ceca /config/routes.rb | |
| parent | 0b511943ef5a8835af34842291725d1dce74b25a (diff) | |
| parent | 533f0ab5f402e110f42d50fb6906a6b58ae312f7 (diff) | |
Merge remote-tracking branch 'origin/release/0.19'0.19
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index d9d21f0bd..9f426fabf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ Alaveteli::Application.routes.draw do match '/blog' => 'general#blog', :as => :blog match '/search' => 'general#search_redirect', :as => :search_redirect match '/search/all' => 'general#search_redirect', :as => :search_redirect - # XXX combined is the search query, and then if sorted a "/newest" at the end. + # `combined` is the search query, and then if sorted a "/newest" at the end. # Couldn't find a way to do this in routes which also picked up multiple other slashes # and dots and other characters that can appear in search query. So we sort it all # out in the controller. @@ -130,7 +130,7 @@ Alaveteli::Application.routes.draw do match '/:feed/list/:view' => 'track#track_list', :as => :track_list, :view => nil, :feed => /(track|feed)/ match '/:feed/body/:url_name' => 'track#track_public_body', :as => :track_public_body, :feed => /(track|feed)/ match '/:feed/user/:url_name' => 'track#track_user', :as => :track_user, :feed => /(track|feed)/ - # XXX :format doesn't work. See hacky code in the controller that makes up for this. + # TODO: :format doesn't work. See hacky code in the controller that makes up for this. match '/:feed/search/:query_array' => 'track#track_search_query', :as => :track_search, :feed => /(track|feed)/, @@ -261,6 +261,7 @@ Alaveteli::Application.routes.draw do match '/api/v2/request/:id.json' => 'api#show_request', :as => :api_show_request, :via => :get match '/api/v2/request/:id.json' => 'api#add_correspondence', :as => :api_add_correspondence, :via => :post + match '/api/v2/request/:id/update.json' => 'api#update_state', :as => :api_update_state, :via => :post match '/api/v2/body/:id/request_events.:feed_type' => 'api#body_request_events', :as => :api_body_request_events, :feed_type => '^(json|atom)$' #### |