aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/request_mailer.rb3
-rw-r--r--app/views/layouts/request_mailer.rhtml1
-rw-r--r--app/views/request_mailer/bounced_message.rhtml3
-rw-r--r--app/views/request_mailer/initial_request.rhtml2
4 files changed, 4 insertions, 5 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 5b9e2d1ed..70f396d61 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_mailer.rb,v 1.8 2007-12-11 12:09:37 francis Exp $
+# $Id: request_mailer.rb,v 1.9 2007-12-12 23:35:09 francis Exp $
class RequestMailer < ActionMailer::Base
@@ -27,6 +27,7 @@ class RequestMailer < ActionMailer::Base
end
def new_response(info_request, incoming_message)
+ raise "foo" + (info_request.user.nil? ? 't' : 'f')
post_redirect = PostRedirect.new(
:uri => classify_request_url(:incoming_message_id => incoming_message.id),
:user_id => info_request.user.id)
diff --git a/app/views/layouts/request_mailer.rhtml b/app/views/layouts/request_mailer.rhtml
new file mode 100644
index 000000000..ce5c18c5b
--- /dev/null
+++ b/app/views/layouts/request_mailer.rhtml
@@ -0,0 +1 @@
+<%= MySociety::Format.wrap_email_body(yield) %>
diff --git a/app/views/request_mailer/bounced_message.rhtml b/app/views/request_mailer/bounced_message.rhtml
index 8c42bd1b5..cdb8e8ddf 100644
--- a/app/views/request_mailer/bounced_message.rhtml
+++ b/app/views/request_mailer/bounced_message.rhtml
@@ -1,4 +1,3 @@
-An incoming email arrived which was not to a known FOI request. Find the
-message attached.
+An incoming email arrived which was not to a known FOI request. Find the message attached.
This message was sent by mysociety/foi/models/request_mailer.rb.
diff --git a/app/views/request_mailer/initial_request.rhtml b/app/views/request_mailer/initial_request.rhtml
index e72439208..67271a122 100644
--- a/app/views/request_mailer/initial_request.rhtml
+++ b/app/views/request_mailer/initial_request.rhtml
@@ -1,5 +1,3 @@
-Dear <%= @info_request.public_body.name %>,
-
<%= @outgoing_message.body %>
--