[Data-Grid] Fixed a bug which caused an invalid SQL query on disabled…

… soft-deletion.
Jack12816 · Oct 22, 2013 · af6209a · af6209a
1 parent 6cc2596
commit af6209a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/helper/controller/data-grid.js b/lib/helper/controller/data-grid.js
@@ -167,7 +167,12 @@ DataGrid.prototype.buildSqlCriteria = function(req, res, options)
         order = req.query.oprop + ' ' + req.query.order.toUpperCase();
     }
 
-    sqlCriteria.where = where + (options.where ? ' ' + options.where : '');
+    if ('undefined' === typeof where) {
+        sqlCriteria.where = (options.where ? options.where : undefined);
+    } else {
+        sqlCriteria.where = where + (options.where ? ' ' + options.where : '');
+    }
+
     sqlCriteria.order = order;
 
     return sqlCriteria;