adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for [ticket:3409 TreeBehavior moves item on save of existing item]

Browse source 
Minor changes to behavior removing references and need to $force


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5830 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-10-21 14:18:46 +00:00
parent 7addec3dcc
commit 717e278550
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cake/libs/model/behaviors/tree.php
View file

@ -43,7 +43,8 @@ class TreeBehavior extends ModelBehavior {
'right' => 'rght',
'scope' => '1 = 1',
'enabled' => true,
'type' => 'nested'
'type' => 'nested',
'__parentChange' => false
), $config);
/*if (in_array($settings['scope'], $model->getAssociated('belongsTo'))) {
@ -70,12 +71,11 @@ class TreeBehavior extends ModelBehavior {
}
if ($created) {
if ((isset($model->data[$model->name][$parent])) && $model->data[$model->name][$parent]) {
return $this->_setParent($model, $model->data[$model->name][$parent], true);
} else {
return true;
return $this->_setParent($model, $model->data[$model->name][$parent]);
}
} elseif (array_key_exists($parent, $model->data[$model->name])) {
return $this->_setParent($model, $model->data[$model->name][$parent], true);
} elseif ($__parentChange) {
$this->settings[$model->name]['__parentChange'] = false;
return $this->_setParent($model, $model->data[$model->name][$parent]);
}
}
/**
@ -149,6 +149,9 @@ class TreeBehavior extends ModelBehavior {
}
}
} elseif (isset($model->data[$model->name][$parent])) {
if ($model->data[$model->name][$parent] != $model->field($parent)) {
$this->settings[$model->name]['__parentChange'] = true;
}
if (!$model->data[$model->name][$parent]) {
$model->data[$model->name][$parent]= null;
} else {
@ -619,15 +622,11 @@ class TreeBehavior extends ModelBehavior {
*
* @param AppModel $model
* @param mixed $parentId
* @param boolean $force process even if current parent_id is the same as the value to be saved
* @return boolean true on success, false on failure
* @access protected
*/
function _setParent(&$model, $parentId = null, $force = false) {
function _setParent(&$model, $parentId = null) {
extract($this->settings[$model->name]);
if (!$force && ($parentId == $model->field($parent))) {
return false;
}
list($node) = array_values($model->find(array($scope, $model->escapeField() => $model->id),
array($model->primaryKey, $parent, $left, $right), null, -1));
$edge = $this->__getMax($model, $scope, $right);