diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-21 23:22:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-21 23:22:12 +0100 |
commit | 4bc625166e381da15aea667b968e186c11be0217 (patch) | |
tree | 1948470d6180a4f4034efc7264f0429061ff7448 /app/presenters | |
parent | 61ed133fea80041b354c78b043cec72dd8644101 (diff) |
Fix bug in relationships API introduced by #6482 (#6527)
It was merge when it needed to be deep_merge. And added some tests
Diffstat (limited to 'app/presenters')
-rw-r--r-- | app/presenters/account_relationships_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index d27fb7b01..b1e99b31b 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -45,7 +45,7 @@ class AccountRelationshipsPresenter maps_for_account = Rails.cache.read("relationship:#{@current_account_id}:#{account_id}") if maps_for_account.is_a?(Hash) - @cached.merge!(maps_for_account) + @cached.deep_merge!(maps_for_account) else @uncached_account_ids << account_id end |