Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

2 files changed, 4 insertions, 3 deletions

diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index fd1405319..ae4bb511a 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -28,7 +28,7 @@ class AdminRequestController < AdminController
         @info_request = InfoRequest.find(params[:id])
         # XXX is this *really* the only way to render a template to a
         # variable, rather than to the response?
-        vars = OpenStruct.new(:name_to => @info_request.user.name, 
+        vars = OpenStruct.new(:name_to => @info_request.user_name, 
                 :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), 
                 :info_request => @info_request, :reason => params[:reason],
                 :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(@info_request),
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 4db07b4c9..718c31e6f 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -151,8 +151,9 @@ class ApiController < ApplicationController
             mail = RequestMailer.create_external_response(request, body, sent_at, attachment_hashes)
             request.receive(mail, mail.encoded, true)
         end
-        
-        head :no_content
+        render :json => {
+            'url' => make_url("request", request.url_title),
+        }        
     end
     
     def body_request_events