mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-02 14:18:46 +02:00
BUGFIX Fixed Hierarchy->markChildren() to only mark nodes as unexpanded if they actually have children. This avoids UI glitches with "plus"-icons beside unexpandable nodes, and prevents batch actions and TreeNode->open() to trigger ajaxExpansion on nodes without children (from r78339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81467 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
c280542b9b
commit
ff254355e7
@ -159,7 +159,11 @@ class Hierarchy extends DataObjectDecorator {
|
|||||||
if($children) {
|
if($children) {
|
||||||
foreach($children as $child) {
|
foreach($children as $child) {
|
||||||
if(!$this->markingFilter || $this->markingFilterMatches($child)) {
|
if(!$this->markingFilter || $this->markingFilterMatches($child)) {
|
||||||
|
if($child->numChildren()) {
|
||||||
$child->markUnexpanded();
|
$child->markUnexpanded();
|
||||||
|
} else {
|
||||||
|
$child->markExpanded();
|
||||||
|
}
|
||||||
$this->markedNodes[$child->ID] = $child;
|
$this->markedNodes[$child->ID] = $child;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user