diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
| commit | 27d6ad899f594bd9b79e54cdc5a3c17110f3b26c (patch) | |
| tree | b75973ee4325bd11f27220e38d1e899076948c78 /app/models/info_request_event.rb | |
| parent | 9bbc93bfd8ba8aaaf9bd1ad9031368b7faad8239 (diff) | |
| parent | 3194a7801684d010dac94c26cf39bb780bfcd17e (diff) | |
Merge branch 'release/0.12'0.12
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'app/models/info_request_event.rb')
| -rw-r--r-- | app/models/info_request_event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 469aabc4a..0967e3940 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -420,7 +420,7 @@ class InfoRequestEvent < ActiveRecord::Base if deep ret[:info_request] = self.info_request.json_for_api(false) ret[:public_body] = self.info_request.public_body.json_for_api - ret[:user] = self.info_request.user.json_for_api + ret[:user] = self.info_request.user_json_for_api end return ret |