diff --git a/app_controller.php b/app_controller.php index 35a4729..0d962dd 100644 --- a/app_controller.php +++ b/app_controller.php @@ -118,7 +118,8 @@ class AppController extends Controller { // Establish the basic query and conditions $query = array_intersect_key($this->jqGridDataCountTables($params, $model), array('link'=>1, 'contain'=>1)); - $query['conditions'] = $this->jqGridDataConditions($params, $model); + $query['conditions'] = $this->jqGridDataCountConditions($params, $model); + $query['group'] = $this->jqGridDataCountGroup($params, $model); // DEBUG PURPOSES ONLY! $params['count_query'] = $query; @@ -234,6 +235,10 @@ class AppController extends Controller { return array('contain' => false); } + function jqGridDataCountConditions(&$params, &$model) { + return $this->jqGridDataConditions($params, $model); + } + function jqGridDataConditions(&$params, &$model) { $searches = array(); @@ -289,6 +294,10 @@ class AppController extends Controller { return null; } + function jqGridDataCountGroup(&$params, &$model) { + return null; + } + function jqGridDataGroup(&$params, &$model) { return $model->alias.'.'.$model->primaryKey; }