aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/api_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-01-28 18:37:32 +0000
committerLouise Crow <louise.crow@gmail.com>2014-01-28 18:37:32 +0000
commit13e2d6fa308ffb16d480aa085cbe57e0e685e02e (patch)
tree65b0f7e27fd8743b9a10e1160e22c9a2763d573f /app/controllers/api_controller.rb
parentfc0c4ea6fa66dc2cbd839de013476205bf574c90 (diff)
parent3ed969e88f60e6a9123a09544e553e48a41dfa12 (diff)
Merge branch 'hotfix/0.16.0.6' into rails-3-develop
Diffstat (limited to 'app/controllers/api_controller.rb')
-rw-r--r--app/controllers/api_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 00a3beebd..e6b0c121a 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -16,11 +16,14 @@ class ApiController < ApplicationController
:status => @request.calculate_status,
:public_body_url => make_url("body", @request.public_body.url_name),
- :requestor_url => make_url("user", @request.user.url_name),
+
:request_email => @request.incoming_email,
:request_text => @request.last_event_forming_initial_request.outgoing_message.body,
}
+ if @request.user
+ @request_data[:requestor_url] = make_url("user", @request.user.url_name)
+ end
render :json => @request_data
end