From acd06ed592531db7a11d4124efd5ce6761fd8ba9 Mon Sep 17 00:00:00 2001 From: Jia Jia Ji Date: Wed, 13 Apr 2022 17:44:55 +0200 Subject: [PATCH 1/2] fixed leaf being expandable with right-click > advanced + removed duplicated values --- .../Controller/Admin/DataObject/DataObjectController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php index 448f518175a..8c1de10d4ec 100644 --- a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php +++ b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php @@ -284,7 +284,6 @@ protected function getTreeNodeConfig($element): array $hasChildren = $child->getDao()->hasChildren($allowedTypes, null, $this->getAdminUser()); $tmpObject['allowDrop'] = false; - $tmpObject['leaf'] = !$hasChildren; $tmpObject['isTarget'] = true; if ($tmpObject['type'] != DataObject::OBJECT_TYPE_VARIANT) { @@ -319,9 +318,6 @@ protected function getTreeNodeConfig($element): array } if ($tmpObject['leaf']) { - $tmpObject['expandable'] = false; - $tmpObject['expanded'] = true; - $tmpObject['leaf'] = false; $tmpObject['loaded'] = true; } From 7c670a21a5de0730ecf3f1afdb0ba825ee888b62 Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Thu, 21 Apr 2022 13:21:53 +0200 Subject: [PATCH 2/2] removed loaded as well --- .../Controller/Admin/DataObject/DataObjectController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php index 8c1de10d4ec..b2ebe153296 100644 --- a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php +++ b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectController.php @@ -317,10 +317,6 @@ protected function getTreeNodeConfig($element): array $tmpObject['cls'] .= 'pimcore_treenode_lockOwner '; } - if ($tmpObject['leaf']) { - $tmpObject['loaded'] = true; - } - return $tmpObject; }