[Helpers][Data-Grid] Added support for SQL joined counts.

Jack12816 · Jan 9, 2014 · 0eb5c47 · 0eb5c47
1 parent 7953478
commit 0eb5c47
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/helper/controller/data-grid.js b/lib/helper/controller/data-grid.js
@@ -69,7 +69,8 @@ DataGrid.prototype.buildSqlPagination = function(sqlCriteria, options, callback)
     greppy.db.get(options.connection).getORM(function(orm, models) {
 
         models[options.entity].count({
-            where : sqlCriteria.where
+            where: sqlCriteria.where,
+            include: sqlCriteria.include
         }).success(function(count) {
 
             callback && callback(null, {
@@ -100,6 +101,9 @@ DataGrid.prototype.buildSqlCriteria = function(req, res, options)
     var order       = undefined;
     var properties  = null;
 
+    // Add includes to criteria object
+    sqlCriteria.include = options.include || undefined;
+
     // Searching
     if (req.query.search && req.query.sprop) {