Merge branch 'release/0.12' into wdtk

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po
    spec/models/info_request_spec.rb

1 files changed, 31 insertions, 0 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