From 2558c80293a920ca57974e46565cfcad52f7b1a6 Mon Sep 17 00:00:00 2001 From: "dr. Hannibal Lecter" Date: Sat, 6 Oct 2012 13:13:51 +0200 Subject: [PATCH 1/2] added (experimental) filter-active class to 1.3.x branch --- controllers/components/filter.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/components/filter.php b/controllers/components/filter.php index 9c15db4..de45848 100644 --- a/controllers/components/filter.php +++ b/controllers/components/filter.php @@ -154,6 +154,11 @@ function beforeRender(&$controller) if (isset($this->formData[$fieldModel][$fieldName])) { $options['value'] = $this->formData[$fieldModel][$fieldName]; + + if ($options['value']) + { + $options['class'] = 'filter-active'; + } } } From 245abb2ddffc720c30e4010081c3980b5ad8e41f Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 5 Nov 2014 13:25:39 +0100 Subject: [PATCH 2/2] Fixes join with related models for "prefixed" tables. --- models/behaviors/filtered.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/behaviors/filtered.php b/models/behaviors/filtered.php index 9705727..d0530bc 100644 --- a/models/behaviors/filtered.php +++ b/models/behaviors/filtered.php @@ -177,7 +177,7 @@ function beforeFind(&$Model, $query) $query['joins'][] = array ( - 'table' => $relatedModel->table, + 'table' => $relatedModel->tablePrefix.$relatedModel->table, 'alias' => $relatedModelAlias, 'type' => 'INNER', 'conditions' => $conditions,