Changeset 4343

Timestamp:

05/08/08 22:04:19 (8 months ago)

Author:

romanb

Message:

Fixed #1023. Thanks for ticket & patch.

Location:

branches/0.11

Files:

• lib/Doctrine/Node/NestedSet.php (modified) (1 diff)
• tests/ValidatorTestCase.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Node/NestedSet.php

@@ -351 +351 @@
             return false;
         }
-        $newRoot = $dest->getNode()->getRootValue();
-        $this->shiftRLValues($dest->getNode()->getLeftValue(), 1, $newRoot);
-        $this->shiftRLValues($dest->getNode()->getRightValue() + 2, 1, $newRoot);
-        
-        $newLeft = $dest->getNode()->getLeftValue();
+        
+        $newLeft  = $dest->getNode()->getLeftValue();
         $newRight = $dest->getNode()->getRightValue() + 2;
-
-        $this->record['level'] = $dest['level'] - 1;
-        $this->insertNode($newLeft, $newRight, $newRoot);
+        $newRoot  = $dest->getNode()->getRootValue();
+                $newLevel = $dest->getNode()->getLevel();
+                
+                // Make space for new node
+        $this->shiftRLValues($dest->getNode()->getRightValue() + 1, 2, $newRoot);
+        
+        // Slide child nodes over one and down one to allow new parent to wrap them
+                $componentName = $this->_tree->getBaseComponent();              
+        $q = new Doctrine_Query();
+        $q->update($componentName);
+        $q->set("$componentName.lft", "$componentName.lft + 1");
+        $q->set("$componentName.rgt", "$componentName.rgt + 1");
+        $q->set("$componentName.level", "$componentName.level + 1");
+        $q->where("$componentName.lft >= ? AND $componentName.rgt <= ?", array($newLeft, $newRight));
+                $q = $this->_tree->returnQueryWithRootId($q, $newRoot);
+                $q->execute();
+        
+        $this->record['level'] = $newLevel;
+                $this->insertNode($newLeft, $newRight, $newRoot);
         
         return true;

branches/0.11/tests/ValidatorTestCase.php

@@ -499 +499 @@
     }
 }
+