diff options
| author | francis <francis> | 2008-09-22 22:08:43 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-09-22 22:08:43 +0000 |
| commit | 945b754b9ecc2d6c002245de58d9870f5beb3961 (patch) | |
| tree | 9aeb1085d61c4de9a924867fa22d1d1a8bc70c51 /app/controllers/admin_request_controller.rb | |
| parent | 0a2e4174028a0102779656e9995d15d9513c64b7 (diff) | |
Fix up test code, and some bugs relating to splitting out raw_email data.
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index dae07aa8a..16e1cc621 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_request_controller.rb,v 1.18 2008-09-13 18:01:27 francis Exp $ +# $Id: admin_request_controller.rb,v 1.19 2008-09-22 22:08:43 francis Exp $ class AdminRequestController < ApplicationController layout "admin" @@ -127,12 +127,12 @@ class AdminRequestController < ApplicationController @incoming_message = IncomingMessage.find(params[:incoming_message_id]) @info_request = @incoming_message.info_request - raw_data = @incoming_message + deleted_incoming_message = @incoming_message incoming_message_id = @incoming_message.id @incoming_message.fully_destroy @incoming_message.info_request.log_event("destroy_incoming", - { :editor => admin_http_auth_user(), :raw_data => raw_data }) + { :editor => admin_http_auth_user(), :deleted_incoming_message => deleted_incoming_message }) flash[:notice] = 'Incoming message successfully destroyed.' redirect_to request_admin_url(@info_request) @@ -152,10 +152,10 @@ class AdminRequestController < ApplicationController redirect_to request_admin_url(incoming_message.info_request) end - raw_email = incoming_message.raw_data - mail = TMail::Mail.parse(raw_email) + raw_email_data = incoming_message.raw_email.data + mail = TMail::Mail.parse(raw_email_data) mail.base64_decode - destination_request.receive(mail, raw_email) + destination_request.receive(mail, raw_email_data) incoming_message.fully_destroy |