Skip to content

Commit 50d9606

Browse files
committed
Merge branch 'refs/heads/3-7-stable'
2 parents 8b45cc7 + 1a97707 commit 50d9606

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.rdoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- Support loading jquery-ui externally, without jquery-ui-rails gem and ask AS to load JS/CSS for addons based on jquery-ui
55
- Support usage with importmap
66
- Add reset_form to search and field_search, when enabled, reset link will clear input fields in the search form, instead of refreshing the list without search and closing the form.
7+
- Fix for mongoid 7
78

89
= 3.7.2
910
- Fix routes

lib/active_scaffold/finder.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,8 @@ def find_page(options = {})
618618
options[:page] ||= 1
619619

620620
find_options = finder_options(options)
621-
query = beginning_of_chain.where(nil) # where(nil) is needed because we need a relation
621+
query = beginning_of_chain
622+
query = query.where(nil) if active_scaffold_config.active_record? # where(nil) is needed because we need a relation
622623

623624
# NOTE: we must use :include in the count query, because some conditions may reference other tables
624625
if options[:pagination] && options[:pagination] != :infinite

0 commit comments

Comments
 (0)