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

2 files changed, 31 insertions, 19 deletions

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
new file mode 100644
index 000000000..a1dd53125
--- /dev/null
+++ b/app/controllers/reports_controller.rb
@@ -0,0 +1,31 @@
+class ReportsController < ApplicationController
+    def create
+        @info_request = InfoRequest.find_by_url_title!(params[:request_id])
+        @reason = params[:reason]
+        @message = params[:message]
+        if @reason.empty?
+            flash[:error] = _("Please choose a reason")
+            render "new"
+            return
+        end
+
+        if !authenticated_user
+            flash[:notice] = _("You need to be logged in to report a request for administrator attention")
+        elsif @info_request.attention_requested
+            flash[:notice] = _("This request has already been reported for administrator attention")
+        else
+            @info_request.report!(@reason, @message, @user)
+            flash[:notice] = _("This request has been reported for administrator attention")
+        end
+        redirect_to request_url(@info_request)
+    end
+
+    def new
+        @info_request = InfoRequest.find_by_url_title!(params[:request_id])
+        if authenticated?(
+            :web => _("To report this request"),
+            :email => _("Then you can report the request '{{title}}'", :title => @info_request.title),
+            :email_subject => _("Report an offensive or unsuitable request"))
+        end
+    end
+end
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index e8547f72f..6ca4e9f82 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -680,25 +680,6 @@ class RequestController < ApplicationController
         end
     end
 
-    def report_request
-        info_request = InfoRequest.find_by_url_title!(params[:url_title])
-        return if !authenticated?(
-                :web => _("To report this FOI request"),
-                :email => _("Then you can report the request '{{title}}'", :title => info_request.title),
-                :email_subject => _("Report an offensive or unsuitable request")
-            )
-
-        if !info_request.attention_requested
-            info_request.set_described_state('attention_requested', @user)
-            info_request.attention_requested = true # tells us if attention has ever been requested
-            info_request.save!
-            flash[:notice] = _("This request has been reported for administrator attention")
-        else
-            flash[:notice] = _("This request has already been reported for administrator attention")
-        end
-        redirect_to request_url(info_request)
-    end
-
     # special caching code so mime types are handled right
     around_filter :cache_attachments, :only => [ :get_attachment, :get_attachment_as_html ]
     def cache_attachments