diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-19 14:13:10 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-19 14:13:10 +0000 |
| commit | 69637c1a5978c38f3734495e14a2e8666502c54a (patch) | |
| tree | 5dd9675c8677a194b7272429b4bdccd486158cc8 /app/controllers/request_controller.rb | |
| parent | 79c39c2a493824590c1862816649bc62e718fe19 (diff) | |
| parent | c1cfd0944500982a62187ec0cf22f008b1f1e723 (diff) | |
Merge branch 'release/0.5' into wdtk
Conflicts:
app/views/public_body/_search_ahead.rhtml
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 90c1f416d..aeb6d31fe 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -689,10 +689,11 @@ class RequestController < ApplicationController # Internal function def get_attachment_internal(html_conversion) @incoming_message = IncomingMessage.find(params[:incoming_message_id]) + @requested_request = InfoRequest.find(params[:id]) @incoming_message.parse_raw_email! @info_request = @incoming_message.info_request if @incoming_message.info_request_id != params[:id].to_i - raise sprintf("Incoming message %d does not belong to request %d", @incoming_message.info_request_id, params[:id]) + raise ActiveRecord::RecordNotFound.new("Incoming message %d does not belong to request %d", @incoming_message.info_request_id, params[:id]) end @part_number = params[:part].to_i @filename = params[:file_name].join("/") |