Implemented deleting a subtree

cakephp · Mar 29, 2014 · 70b10c8 · 70b10c8
1 parent 99c8877
commit 70b10c8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Model/Behavior/TreeBehavior.php b/src/Model/Behavior/TreeBehavior.php
@@ -118,8 +118,10 @@ public function beforeDelete(Event $event, Entity $entity) {
 		$diff = $right - $left + 1;
 
 		if ($diff > 2) {
-			$this->_table->deleteAll(['left >=' => $left + 1, 'left <=' => $right - 1]);
-			return;
+			$this->_table->deleteAll([
+				"{$config['left']} >=" => $left + 1,
+				"{$config['left']} <=" => $right - 1
+			]);
 		}
 
 		$this->_sync($diff, '-' , "> {$right}");

diff --git a/tests/TestCase/Model/Behavior/TreeBehaviorTest.php b/tests/TestCase/Model/Behavior/TreeBehaviorTest.php
@@ -522,4 +522,22 @@ public function testDeleteLeaf() {
 		$expected = $table->find()->order('lft')->hydrate(false)->toArray();
 		$this->assertEquals($expected, $result);
 	}
+
+
+/**
+ * Tests deleting a subtree
+ *
+ * @return void
+ */
+	public function testDeleteSubTree() {
+		$table = TableRegistry::get('NumberTrees');
+		$table->addBehavior('Tree');
+		$entity = $table->get(6);
+		$this->assertTrue($table->delete($entity));
+		$result = $table->find()->order('lft')->hydrate(false)->toArray();
+		$table->recover();
+		$expected = $table->find()->order('lft')->hydrate(false)->toArray();
+		$this->assertEquals($expected, $result);
+	}
+
 }