diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-19 11:54:15 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-19 12:00:05 +0000 |
| commit | 286abd1ff21e09fbab831c4c3439bff9e8ddce56 (patch) | |
| tree | 8f9f3ec9a973156a8d3130b8f55d45baf9f129e2 /app/models/info_request.rb | |
| parent | 685938f1d736c54663011274ca563ba94d0e49b0 (diff) | |
Handle a request for json on a an external request - return the user_name attribute instead of a full user model. Fixes #715.
Diffstat (limited to 'app/models/info_request.rb')
| -rw-r--r-- | app/models/info_request.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |