From 286abd1ff21e09fbab831c4c3439bff9e8ddce56 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 19 Nov 2012 11:54:15 +0000 Subject: Handle a request for json on a an external request - return the user_name attribute instead of a full user model. Fixes #715. --- app/models/info_request.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index e1885dee6..e9335228a 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1124,7 +1124,11 @@ public } if deep - ret[:user] = self.user.json_for_api + if self.user + ret[:user] = self.user.json_for_api + else + ret[:user_name] = self.user_name + end ret[:public_body] = self.public_body.json_for_api ret[:info_request_events] = self.info_request_events.map { |e| e.json_for_api(false) } end -- cgit v1.2.3