diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/info_request.rb | 9 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 6 | ||||
| -rw-r--r-- | app/views/request_mailer/requires_admin.rhtml | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 93931ab98..f0587a975 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.119 2008-10-09 15:48:22 francis Exp $ +# $Id: request_controller.rb,v 1.120 2008-10-14 12:48:48 francis Exp $ class RequestController < ApplicationController @@ -241,7 +241,7 @@ class RequestController < ApplicationController end # Make the state change - @info_request.set_described_state(params[:incoming_message][:described_state], params[:incoming_message][:requires_admin_details]) + @info_request.set_described_state(params[:incoming_message][:described_state]) # Display appropriate next page (e.g. help for complaint etc.) if @info_request.calculate_status == 'waiting_response' diff --git a/app/models/info_request.rb b/app/models/info_request.rb index b1d411113..0c99dadbf 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.145 2008-10-03 17:09:06 francis Exp $ +# $Id: info_request.rb,v 1.146 2008-10-14 12:48:49 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -316,7 +316,7 @@ public end # change status, including for last event for later historical purposes - def set_described_state(new_state, details = nil) + def set_described_state(new_state) ActiveRecord::Base.transaction do self.awaiting_description = false last_event = self.get_last_event @@ -329,10 +329,7 @@ public self.calculate_event_states if new_state == 'requires_admin' - RequestMailer.deliver_requires_admin(self, details) - else - # XXX this chucks details if we are not moving to requires_admin - - # the user is not meant to have entered any. + RequestMailer.deliver_requires_admin(self) end end diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index dfe8d9830..374355810 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.60 2008-10-03 17:09:06 francis Exp $ +# $Id: request_mailer.rb,v 1.61 2008-10-14 12:48:49 francis Exp $ class RequestMailer < ApplicationMailer @@ -91,13 +91,13 @@ class RequestMailer < ApplicationMailer end # An FOI response is outside the scope of the system, and needs admin attention - def requires_admin(info_request, details) + def requires_admin(info_request) @from = info_request.user.name_and_email @recipients = contact_from_name_and_email @subject = "Unusual FOI response - " + info_request.title url = main_url(request_url(info_request)) admin_url = request_admin_url(info_request) - @body = {:info_request => info_request, :url => url, :admin_url => admin_url, :details => details } + @body = {:info_request => info_request, :url => url, :admin_url => admin_url } end # Tell the requester that a new response has arrived diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml index 45b75138a..29f3e1e38 100644 --- a/app/views/request_mailer/requires_admin.rhtml +++ b/app/views/request_mailer/requires_admin.rhtml @@ -6,8 +6,6 @@ reply to this email to let them know what you are going to do about it. Request '<%=@info_request.title%>': <%= @url %> -Details: "<%= @details %>" - Administration URL: <%= @admin_url %> --------------------------------------------------------------------- |