diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-19 14:34:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 14:34:08 +0100 |
| commit | c7f04961b6dcb1b7e12136deadcf65076c130c40 (patch) | |
| tree | 20788cbb86d4ae8d38ce539325205e5f0a1ee344 /app/controllers/concerns | |
| parent | ba22398c38067e05f141a0dddeb20bf68913988a (diff) | |
| parent | 3b7b607300d662aa1f25d459ca12aec89ab550e8 (diff) | |
Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/cache_concern.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb index 3fb4b962a..05e431b19 100644 --- a/app/controllers/concerns/cache_concern.rb +++ b/app/controllers/concerns/cache_concern.rb @@ -31,7 +31,9 @@ module CacheConcern def cache_collection(raw, klass) return raw unless klass.respond_to?(:with_includes) - raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation) + raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation) + return [] if raw.empty? + cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id) uncached_ids = raw.map(&:id) - cached_keys_with_value.keys |