@@ -3,21 +3,22 @@
/**
* undocumented class
*
- * @todo Add support for negative field inclusion rules
* @package default
* @access public
*/
-class ExpandableBehavior extends ModelBehavior {
+class ExpandableBehavior extends ModelBehavior{
var $settings = array();
function setup(&$Model, $settings = array()) {
- $default = array('schema' => $Model->schema());
+ $base = array('schema' => $Model->schema());
if (isset($settings['with'])) {
- return $this->settings[$Model->alias] = am($default, $settings);
+ $conventions = array('foreignKey', $Model->hasMany[$settings['with']]['foreignKey']);
+ return $this->settings[$Model->alias] = am($base, $conventions, $settings);
}
foreach ($Model->hasMany as $assoc => $option) {
if (strpos($assoc, 'Field') !== false) {
- return $this->settings[$Model->alias] = am($default, array('with' => $assoc), $settings);
+ $conventions = array('with' => $assoc, 'foreignKey' => $Model->hasMany[$assoc]['foreignKey']);
+ return $this->settings[$Model->alias] = am($base, $conventions, !empty($settings) ? $settings : array());
}
}
}
@@ -41,16 +42,18 @@ class ExpandableBehavior extends ModelBehavior {
$id = $Model->id;
foreach ($fields as $key => $val) {
$field = $Model->{$with}->find('first', array(
- // refactor file_id
'fields' => array($with.'.id'),
- 'conditions' => array($with.'.file_id' => $id, $with.'.key' => $key),
+ 'conditions' => array($with.'.'.$foreignKey => $id, $with.'.key' => $key),
'recursive' => -1,
));
+ $Model->{$with}->create(false);
if ($field) {
- $Model->{$with}->create();
- $Model->{$with}->id = $field[$with]['id'];
- $Model->{$with}->save(array('val' => $val));
+ $Model->{$with}->set('id', $field[$with]['id']);
+ } else {
+ $Model->{$with}->set(array($foreignKey => $id, 'key' => $key));
}
+ $Model->{$with}->set('val', $val);
+ $Model->{$with}->save();
}
}
}
cakephp/behaviors/expandable/expandable.php
@@ -25,7 +25,6 @@ class ContainableBehaviorTest extends CakeTestCase {
function testAfterFind() {
$r = $this->File->find('all');
- var_export($r);
$this->assertTrue(Set::matches('/FileTestModel[1]/.[colors=255]', $r));
$this->assertTrue(Set::matches('/FileTestModel[1]/.[page_id=1]', $r));
$this->assertTrue(Set::matches('/FileTestModel[2]/.[comment=This is the Thumbnail version]', $r));
cakephp/behaviors/expandable/expandable.test.php
735162b74eaa6096c0cc257e638b4c1767b7db37
Felix Geisendörfer
felix@debuggable.com
http://github.com/felixge/debuggable-scraps/commit/54a06e9f7ce6b477c8b001a2ab9080b90a64e00b
54a06e9f7ce6b477c8b001a2ab9080b90a64e00b
2008-11-04T11:53:21-08:00
2008-11-04T11:52:05-08:00
Update expandable to latest version
10dc50092d14c972abddf4858ee258d3a561904a
Felix Geisendörfer
felix@debuggable.com