abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor logic and formatting changes. Considering making Linkable operate recursively.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@354 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-20 19:00:54 +00:00
parent 7304a0e889
commit 7181bc7f9b
1 changed files with 293 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
models/behaviors/linkable.php
View File

@@ -130,11 +130,18 @@ class LinkableBehavior extends ModelBehavior {
} }
public function beforeFind(&$Model, $query) { public function beforeFind(&$Model, $query) {
return $this->buildQuery($Model, $query);
}
function buildQuery(&$Model, $query) {
$this->pr(10, $this->pr(10,
array('function' => 'Linkable::beforeFind', array('function' => 'Linkable::buildQuery',
'args' => array('Model->alias' => '$Model->alias') + compact('query'), 'args' => array('Model->alias' => '$Model->alias') + compact('query'),
)); ));
if (isset($query[$this->_key])) {
if (!isset($query[$this->_key]))
return $query;
$optionsDefaults = $this->_defaults + array('reference' => $optionsDefaults = $this->_defaults + array('reference' =>
array('class' => $Model->alias, array('class' => $Model->alias,
'alias' => $Model->alias), 'alias' => $Model->alias),
@@ -421,7 +428,7 @@ class LinkableBehavior extends ModelBehavior {
++$cont; ++$cont;
$notDone = isset($iterators[$cont]); $notDone = isset($iterators[$cont]);
} while ($notDone); } while ($notDone);
}
$this->pr(20, $this->pr(20,
array('function' => 'Linkable::beforeFind', array('function' => 'Linkable::beforeFind',
'return' => compact('query'), 'return' => compact('query'),