Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 24 insertions, 0 deletions

diff --git a/app/controllers/admin_info_request_event_controller.rb b/app/controllers/admin_info_request_event_controller.rb
new file mode 100644
index 000000000..17d147582
--- /dev/null
+++ b/app/controllers/admin_info_request_event_controller.rb
@@ -0,0 +1,24 @@
+# app/controllers/admin_info_request_event_controller.rb:
+# Controller for FOI request event manipulation from the admin interface.
+#
+# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
+# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
+
+class AdminInfoRequestEventController < AdminController
+
+    # used so due dates get fixed
+    def update
+        @info_request_event = InfoRequestEvent.find(params[:id])
+        if @info_request_event.event_type != 'response'
+            raise Exception("can only mark responses as requires clarification")
+        end
+        @info_request_event.described_state = 'waiting_clarification'
+        @info_request_event.calculated_state = 'waiting_clarification'
+        # TODO: deliberately don't update described_at so doesn't reenter search?
+        @info_request_event.save!
+
+        flash[:notice] = "Old response marked as having been a clarification"
+        redirect_to admin_request_url(@info_request_event.info_request)
+    end
+
+end