fix conditions on belongsTo

plusglobal · Feb 10, 2014 · 598d0be · 598d0be
1 parent 4ba107e
commit 598d0be
Show file tree

Hide file tree

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

diff --git a/Model/Behavior/BrwPanelBehavior.php b/Model/Behavior/BrwPanelBehavior.php
@@ -833,4 +833,4 @@ public function brwSchema($Model) {
 		return $retSchema;
 	}
 
-}
+}
diff --git a/Model/Behavior/BrwUploadBehavior.php b/Model/Behavior/BrwUploadBehavior.php
@@ -224,4 +224,4 @@ public function resizedVersions($Model, $model, $recordId, $sizes, $category_cod
 	}
 
 
-}
+}
diff --git a/Model/Behavior/BrwUserBehavior.php b/Model/Behavior/BrwUserBehavior.php
@@ -106,4 +106,4 @@ public function checkAndCreate($Model, $email, $password) {
 	}
 
 
-}
+}