From 28afa5f085b17ba74f009aeb8a78520a32f0e47b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 21 Aug 2013 14:21:46 +0100 Subject: 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 --- app/controllers/request_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/request_controller.rb') 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 -- cgit v1.2.3