diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-15 10:24:08 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-15 10:24:08 +0100 |
| commit | c2fe6bec28a9b43c84b58fde305b19d179760c13 (patch) | |
| tree | 466354ca48819f291b7d552de0078af3eb55682c /app/controllers/admin_request_controller.rb | |
| parent | 212dcc44e73e29ff0852aead03e38806705bdc99 (diff) | |
| parent | 8714cf41012ad039f4bc97ba00593414468497e1 (diff) | |
Merge branch 'feature/further-request-event-fixes' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 66989ea93..40ccfb98c 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -62,9 +62,6 @@ class AdminRequestController < AdminController @info_request.title = params[:info_request][:title] @info_request.prominence = params[:info_request][:prominence] - if @info_request.described_state != params[:info_request][:described_state] - @info_request.set_described_state(params[:info_request][:described_state]) - end @info_request.awaiting_description = params[:info_request][:awaiting_description] == "true" ? true : false @info_request.allow_new_responses_from = params[:info_request][:allow_new_responses_from] @info_request.handle_rejected_responses = params[:info_request][:handle_rejected_responses] @@ -77,13 +74,16 @@ class AdminRequestController < AdminController { :editor => admin_current_user(), :old_title => old_title, :title => @info_request.title, :old_prominence => old_prominence, :prominence => @info_request.prominence, - :old_described_state => old_described_state, :described_state => @info_request.described_state, + :old_described_state => old_described_state, :described_state => params[:info_request][:described_state], :old_awaiting_description => old_awaiting_description, :awaiting_description => @info_request.awaiting_description, :old_allow_new_responses_from => old_allow_new_responses_from, :allow_new_responses_from => @info_request.allow_new_responses_from, :old_handle_rejected_responses => old_handle_rejected_responses, :handle_rejected_responses => @info_request.handle_rejected_responses, :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string, :old_comments_allowed => old_comments_allowed, :comments_allowed => @info_request.comments_allowed }) + if @info_request.described_state != params[:info_request][:described_state] + @info_request.set_described_state(params[:info_request][:described_state]) + end # expire cached files expire_for_request(@info_request) flash[:notice] = 'Request successfully updated.' |