#count breaks when default-scoped with select. Closes #2129, Fixes #2447

railsadminteam · Nov 3, 2015 · aa458e1 · aa458e1
1 parent 8b53060
commit aa458e1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/rails_admin/adapters/active_record.rb b/lib/rails_admin/adapters/active_record.rb
@@ -40,7 +40,7 @@ def all(options = {}, scope = nil)
       end
 
       def count(options = {}, scope = nil)
-        all(options.merge(limit: false, page: false), scope).count
+        all(options.merge(limit: false, page: false), scope).count(:all)
       end
 
       def destroy(objects)

diff --git a/spec/rails_admin/adapters/active_record_spec.rb b/spec/rails_admin/adapters/active_record_spec.rb
@@ -47,8 +47,24 @@
       expect(@players).to include abstract_model.first
     end
 
-    it '#count returns count of items' do
-      expect(abstract_model.count).to eq(@players.count)
+    describe '#count' do
+      it 'returns count of items' do
+        expect(abstract_model.count).to eq(@players.count)
+      end
+
+      context 'when default-scoped with select' do
+        before do
+          class PlayerWithDefaultScope < Player
+            self.table_name = 'players'
+            default_scope { select(:id, :name) }
+          end
+        end
+        let(:abstract_model) { RailsAdmin::AbstractModel.new('PlayerWithDefaultScope') }
+
+        it 'does not break' do
+          expect(abstract_model.count).to eq(@players.count)
+        end
+      end
     end
 
     it '#destroy destroys multiple items' do