aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-08-21 14:21:46 +0100
committerLouise Crow <louise.crow@gmail.com>2013-09-16 12:42:19 +0100
commit28afa5f085b17ba74f009aeb8a78520a32f0e47b (patch)
tree3d118ef2f6c73d5af4044895bf6d85219fc8ea7c /app/controllers/request_controller.rb
parent5b42308b116ee0bbdecf3f1c0e1c5f0c0e25b757 (diff)
Make sure that info_request gets assigned to the view
This should be handled by assign_variables_for_show_template. Otherwise, the make_request_summary_file method shouldn't depend on instance variables
Diffstat (limited to 'app/controllers/request_controller.rb')
-rw-r--r--app/controllers/request_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 17b836f8f..0180ad840 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -915,7 +915,7 @@ class RequestController < ApplicationController
end
def assign_variables_for_show_template(info_request)
- # Other parameters
+ @info_request = info_request
@info_request_events = info_request.info_request_events
@status = info_request.calculate_status
@old_unclassified = info_request.is_old_unclassified? && !authenticated_user.nil?
@@ -957,7 +957,7 @@ class RequestController < ApplicationController
:data => File.open(tmp_output.path).read }
done = true
else
- logger.error("Could not convert info request #{@info_request.id} to PDF with command '#{convert_command} #{tmp_input.path} #{tmp_output.path}'")
+ logger.error("Could not convert info request #{info_request.id} to PDF with command '#{convert_command} #{tmp_input.path} #{tmp_output.path}'")
end
tmp_output.close
tmp_input.delete