diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-08-01 14:39:18 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-08-01 14:39:18 +0100 |
| commit | 67a3a43cc26f8ad7218f33a13af04c3c74347866 (patch) | |
| tree | 3fc5f27905332ba4647915eb5823d3d37615fe4c /app/controllers/admin_request_controller.rb | |
| parent | c1d2580892033d28ff05f3d47cee78aaef963c29 (diff) | |
| parent | cc3268df4c9de319ea16aa99238e3c4c40dae7c5 (diff) | |
Merge branch 'develop' into wdtk
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 2 |
1 files changed, 1 insertions, 1 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), |