From a3d84e705a6e19ebbc240604de62c3ef8531ddf9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 3 May 2018 10:41:41 +0200
Subject: [PATCH] Fix cache_associated no longer working (#7320)
---
app/models/concerns/cacheable.rb | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/models/concerns/cacheable.rb b/app/models/concerns/cacheable.rb
index 51451d2607..d7524cdfd0 100644
--- a/app/models/concerns/cacheable.rb
+++ b/app/models/concerns/cacheable.rb
@@ -3,14 +3,19 @@
module Cacheable
extend ActiveSupport::Concern
- class_methods do
+ module ClassMethods
+ @cache_associated = []
+
def cache_associated(*associations)
@cache_associated = associations
end
- end
- included do
- scope :with_includes, -> { includes(@cache_associated) }
- scope :cache_ids, -> { select(:id, :updated_at) }
+ def with_includes
+ includes(@cache_associated)
+ end
+
+ def cache_ids
+ select(:id, :updated_at)
+ end
end
end
--
GitLab