Skip to content

Fixes join with related models which have "associative" conditions. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertboada wants to merge 1 commit into
base: 1.3.x
Choose a base branch
from
Open

Fixes join with related models which have "associative" conditions. #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions models/behaviors/filtered.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FilteredBehavior extends ModelBehavior
/**
* Keeps current values after filter form post.
*
* @var array
* @var array
*/
var $_filterValues = array();

Expand Down Expand Up @@ -171,7 +171,8 @@ function beforeFind(&$Model, $query)
$customConditions = array($customConditions);
}

$filterConditions = preg_replace(sprintf('#(?<![A-Za-z])%s(?![A-Za-z])#', $relatedModel->alias), $relatedModelAlias, $customConditions);

$filterConditions = $this->_replaceArrayKeysAndValues(sprintf('#(?<![A-Za-z])%s(?![A-Za-z])#', $relatedModel->alias), $relatedModelAlias, $customConditions);
$conditions = array_merge($conditions, $filterConditions);
}

Expand Down Expand Up @@ -275,4 +276,15 @@ function _setFilterValues(&$Model, $method, $values = array())

$this->_filterValues[$Model->alias] = array_merge($this->_filterValues[$Model->alias], $values);
}

function _replaceArrayKeysAndValues($pattern, $replacement, $input)
{
$keys = array_keys($input);
$values = array_values($input);

$newKeys = preg_replace($pattern, $replacement, $keys);
$newValues = preg_replace($pattern, $replacement, $values);

return array_combine($newKeys, $newValues);
}
}