diff --git a/lib/helper/controller/data-grid.js b/lib/helper/controller/data-grid.js index c24ef69..9de9b55 100644 --- 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) {