aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/request_controller.rb1
-rw-r--r--spec/lib/tmail_extensions_spec.rb5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 99aa3c7ea..fbf862af3 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -607,6 +607,7 @@ class RequestController < ApplicationController
else
incoming_message = IncomingMessage.find(params[:incoming_message_id])
if !incoming_message.info_request.user_can_view?(authenticated_user)
+ @info_request = incoming_message.info_request # used by view
render :template => 'request/hidden', :status => 410 # gone
end
end
diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb
index 6a55c34da..02ef8b82e 100644
--- a/spec/lib/tmail_extensions_spec.rb
+++ b/spec/lib/tmail_extensions_spec.rb
@@ -5,6 +5,11 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe "when using TMail" do
+ fixtures :info_requests, :incoming_messages
+
+ before(:each) do
+ ActionMailer::Base.deliveries.clear
+ end
it "should load an email with funny MIME settings" do
# just send it to the holding pen