L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-39801 navigation_node::remove does not allow to insert nodes afterwards

Browse Source
This commit is contained in:
Marina Glancy
2013-06-04 02:06:09 +02:00
committed by Eloy Lafuente (stronk7)
parent 337c63aac4
commit 4f8af9cbdf
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+1
View File
@@ -891,6 +891,7 @@ class navigation_node_collection implements IteratorAggregate {
foreach ($this->collection as $colkey => $node) {
if ($node->key === $key && $node->type == $type) {
unset($this->collection[$colkey]);
$this->collection = array_values($this->collection);
break;
}
}
lib/tests/navigationlib_test.php
+10
View File
@@ -258,9 +258,19 @@ class navigation_node_testcase extends basic_testcase {
$this->assertFalse($this->node->get('remove1'));
$this->assertFalse(in_array('remove1', $this->node->get_children_key_list(), true));
// Make sure that we can insert element after removal
$insertelement = navigation_node::create('extra element 4', null, navigation_node::TYPE_CUSTOM, null, 'element4');
$this->node->add_node($insertelement, 'remove2');
$this->assertNotEmpty($this->node->get('element4'));
// Remove more elements
$this->assertTrue($this->node->get('remove2')->remove());
$this->assertFalse($this->node->get('remove2'));
// Make sure that we can add element after removal
$this->node->add('extra element 5', null, navigation_node::TYPE_CUSTOM, null, 'element5');
$this->assertNotEmpty($this->node->get('element5'));
$this->assertTrue($remove2->get('remove3')->remove());
$this->assertFalse($this->node->get('remove1'));