Fix .count with .select in light of Rails 4.1 change

See rails/rails#10710
glowfic-constellation · May 24, 2017 · 3e03e37 · 3e03e37
1 parent 5949e1a
commit 3e03e37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -107,7 +107,7 @@ def posts_from_relation(relation, no_tests=true, with_pagination=true)
     posts = posts.paginate(page: page, per_page: 25) if with_pagination
     posts = posts.no_tests if no_tests
 
-    if (with_pagination && posts.total_pages <= 1) || posts.count <= 25
+    if (with_pagination && posts.total_pages <= 1) || posts.count(:all) <= 25
       posts = posts.select {|post| post.visible_to?(current_user)}
     end
 

diff --git a/app/views/posts/_generate_flat.haml b/app/views/posts/_generate_flat.haml
@@ -1,4 +1,4 @@
-- 1.upto((replies.count / 250.0).ceil).each do |index|
+- 1.upto((replies.count(:all) / 250.0).ceil).each do |index|
   - replies.paginate(per_page: 250, page: index).each do |reply|
     - klass = cycle('even'.freeze, 'odd'.freeze)
     .post-container{class: klass}