diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 5 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 83b6e96ef..d00934e0b 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.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_controller.rb,v 1.108 2008-09-14 01:40:29 francis Exp $ +# $Id: request_controller.rb,v 1.109 2008-09-22 02:36:03 francis Exp $ class RequestController < ApplicationController @@ -93,7 +93,8 @@ class RequestController < ApplicationController end @info_request = InfoRequest.new(params[:info_request]) @outgoing_message = OutgoingMessage.new(params[:outgoing_message]) - + @outgoing_message.set_signature_name(@user.name) if !@user.nil? + if @info_request.public_body.nil? redirect_to frontpage_url else diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 61990f2e6..0007482c3 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: outgoing_message.rb,v 1.63 2008-09-22 02:29:14 francis Exp $ +# $Id: outgoing_message.rb,v 1.64 2008-09-22 02:36:04 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request @@ -53,6 +53,15 @@ class OutgoingMessage < ActiveRecord::Base return "Yours faithfully," end end + def get_default_message + get_salutation + "\n\n\n\n" + get_signoff + "\n\n" + end + def set_signature_name(name) + # XXX We use raw_body here to get unstripped one + if self.raw_body == self.get_default_message + self.body = self.raw_body + name + end + end def body ret = read_attribute(:body) @@ -84,7 +93,7 @@ class OutgoingMessage < ActiveRecord::Base # Set default letter def after_initialize if self.body.nil? - self.body = get_salutation + "\n\n\n\n" + get_signoff + "\n\n" + self.body = get_default_message end end |