consider conditions in relationships when showing filters

plusglobal · Mar 27, 2014 · 83b59be · 83b59be
1 parent c882ca9
commit 83b59be
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Controller/ContentsController.php b/Controller/ContentsController.php
@@ -119,11 +119,7 @@ public function view($model, $id) {
 						if ($indx = array_search($related_model['foreignKey'], $AssocModel->brwConfig['paginate']['fields'])) {
 							unset($AssocModel->brwConfig['paginate']['fields'][$indx]);
 						}
-						$filters = Hash::merge(
-							$this->_filterConditions($AssocModel),
-							(!empty($this->Model->hasMany[$AssocModel->name]['conditions'])) ?
-								$this->Model->hasMany[$AssocModel->name]['conditions'] : array()
-						);
+						$filters = $this->_filterConditions($AssocModel);
 						$this->paginate[$AssocModel->name] = Set::merge(
 							$AssocModel->brwConfig['paginate'],
 							array('conditions' => $filters),
@@ -743,7 +739,7 @@ public function _setFilterData($Model) {
 					}
 				}
 			} elseif ($type == 'integer' or $type == 'boolean' or $type == 'string' or $type == 'select') {
-				if (array_key_exists($model . '.' . $field, $this->params['named'])) {
+				if (!empty($this->params['named'][$model . '.' . $field])) {
 					$fieldData = $this->params['named'][$model . '.' . $field];
 					if ($type  == 'integer' and strstr($fieldData, '.')) {
 						$fieldData = explode('.', $fieldData);