Merge remote-tracking branch 'openaustralia_github/more_info_on_report_request' into rails-3-develop

1 files changed, 4 insertions, 7 deletions

diff --git a/config/routes.rb b/config/routes.rb
index bc03d91e1..56be975c3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,15 +57,12 @@ Alaveteli::Application.routes.draw do
 
     match '/upload/request/:url_title' => 'request#upload_response', :as => :upload_response
     match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request
-
-    # It would be nice to add :conditions => { :method => :post } to this next one,
-    # because it ought not really to be available as a GET request since it changes
-    # the server state. Unfortunately this doesn’t play well with the PostRedirect
-    # mechanism, which assumes all post-login actions are available via GET, so we
-    # refrain.
-    match '/request/:url_title/report' => 'request#report_request', :as => :report
     ####
 
+    resources :request, :only => [] do
+        resource :report, :only => [:new, :create]
+    end
+
     #### User controller
     # Use /profile for things to do with the currently signed in user.
     # Use /user/XXXX for things that anyone can see about that user.