diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-07-09 12:42:47 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-16 15:38:37 +0100 |
| commit | 9289239593e4a64eb51b4183ab70357642810a25 (patch) | |
| tree | e34890af01c0a19a0cc793583d212ef13f46a213 /app/controllers/admin_request_controller.rb | |
| parent | 32f44e53c879481198bdc02044d4fd3c892ce801 (diff) | |
Ensure (at least in the most basic cases) that views support recent "external request" changes (mainly that InfoRequests no longer necessarily have a User).
Conflicts:
app/controllers/admin_request_controller.rb
app/views/request/show.rhtml
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index dba4955dc..b6ea4fe60 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -28,7 +28,8 @@ 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), |