diff options
| author | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
| commit | df1754847892bb6abce2681a42d8c50cf8d3a2da (patch) | |
| tree | 73c518103906ad446cedd55c69690d8d91f0f362 /app/controllers/admin_request_controller.rb | |
| parent | a63e598b9e0ddfa7ac695b1be41aaace6c0eb628 (diff) | |
| parent | 766df1c7de8f820bd6e451526787632a136bc635 (diff) | |
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Conflicts:
locale/cy/app.po
locale/de/app.po
locale/es/app.po
locale/fr/app.po
locale/sq/app.po
locale/sr/app.po
locale/sr@latin/app.po
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index d5bd4c4d6..e5de4f8b7 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -177,7 +177,7 @@ class AdminRequestController < AdminController raw_email_data = incoming_message.raw_email.data mail = TMail::Mail.parse(raw_email_data) mail.base64_decode - destination_request.receive(mail, raw_email_data) + destination_request.receive(mail, raw_email_data, true) incoming_message_id = incoming_message.id incoming_message.fully_destroy @@ -275,7 +275,6 @@ class AdminRequestController < AdminController def show_raw_email @raw_email = RawEmail.find(params[:id]) - # For the holding pen, try to guess where it should be ... @holding_pen = false if (@raw_email.incoming_message.info_request == InfoRequest.holding_pen_request && !@raw_email.incoming_message.mail.from_addrs.nil? && @raw_email.incoming_message.mail.from_addrs.size > 0) @@ -294,15 +293,11 @@ class AdminRequestController < AdminController end # 2. Match the email address in the message without matching the hash - @info_requests = [] - addresses = - (@raw_email.incoming_message.mail.to || []) + - (@raw_email.incoming_message.mail.cc || []) + - (@raw_email.incoming_message.mail.envelope_to || []) - addresses.uniq! - for address in addresses - @info_requests += InfoRequest.guess_by_incoming_email(address) - end + @info_requests = InfoRequest.guess_by_incoming_email(@raw_email.incoming_message) + + # 3. Give a reason why it's in the holding pen + last_event = InfoRequestEvent.find_by_incoming_message_id(@raw_email.incoming_message.id) + @rejected_reason = last_event.params[:rejected_reason] end end |