Merge branch 'hotfix-3.1.2' into stable

pixl8 · Apr 20, 2021 · 3c66aa7 · 3c66aa7
2 parents d95e700 + 382dede
commit 3c66aa7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1.2
+
+* Pass through all args when using recordCountOnly=true to ensure saved/extra filters are included
+
 ## v3.1.1
 
 * Add `getMultipleRecords()` method for embedding entities

diff --git a/services/DataApiService.cfc b/services/DataApiService.cfc
@@ -76,10 +76,14 @@ component {
 		}
 
 		var result = {
-			  records    = _selectData( arguments.entity, args, arguments.fields )
-			, totalCount = _selectData( arguments.entity, { recordCountOnly=true, filter=args.filter } )
+			records = _selectData( arguments.entity, args, arguments.fields )
 		};
 
+		args.recordCountOnly = true;
+		structDelete( args, "maxRows" );
+
+		result.totalCount = _selectData( arguments.entity, args, arguments.fields )
+
 		result.totalPages = Ceiling( result.totalCount / arguments.pageSize );
 		result.prevPage   = arguments.page -1;
 		result.nextPage   = arguments.page >= result.totalPages ? 0 : arguments.page+1;