aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-07-23 15:18:02 +0100
committerLouise Crow <louise.crow@gmail.com>2013-07-23 15:18:02 +0100
commitb24ad7c7fa9b12303cc3c558de6dbdaacfe501e2 (patch)
tree30443b7edf8c2d304f287f692ca7ccb183184645 /app/controllers/request_controller.rb
parent7e5cfe32fc47e296e3d273bfb65705da0a24abda (diff)
parent81090b8eb2d8d24072807062ccd5f32c8074069e (diff)
Merge remote-tracking branch 'openaustralia_github/tests_set_described_state' into rails-3-develop
Conflicts: spec/models/info_request_spec.rb
Diffstat (limited to 'app/controllers/request_controller.rb')
-rw-r--r--app/controllers/request_controller.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 42693f867..d8f8db3cf 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -417,12 +417,22 @@ class RequestController < ApplicationController
end
# Make the state change
+ event = info_request.log_event("status_update",
+ { :user_id => authenticated_user.id,
+ :old_described_state => info_request.described_state,
+ :described_state => described_state,
+ })
+
info_request.set_described_state(described_state, authenticated_user, message)
# If you're not the *actual* requester. e.g. you are playing the
# classification game, or you're doing this just because you are an
# admin user (not because you also own the request).
if !info_request.is_actual_owning_user?(authenticated_user)
+ # Create a classification event for league tables
+ RequestClassification.create!(:user_id => authenticated_user.id,
+ :info_request_event_id => event.id)
+
# Don't give advice on what to do next, as it isn't their request
if session[:request_game]
flash[:notice] = _('Thank you for updating the status of the request \'<a href="{{url}}">{{info_request_title}}</a>\'. There are some more requests below for you to classify.',:info_request_title=>CGI.escapeHTML(info_request.title), :url=>CGI.escapeHTML(request_path(info_request)))