aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/api_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-02-19 10:18:10 +0000
committerLouise Crow <louise.crow@gmail.com>2014-02-19 10:18:10 +0000
commit17bc0ba1bca6783b76957f5769e2e9d96d0ee8e4 (patch)
tree15b933fee15118d276f22e6bd94f7b9ac941bea1 /app/controllers/api_controller.rb
parent4218258787f0e9affd5f84baa078d9d32e8bae3d (diff)
parent95169c33db002c04a6a31a6a5db1ea59668f1292 (diff)
Merge branch 'hotfix/0.16.0.7' into wdtk
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