From 00c71bf795cf57c9aed4c64e7d89b8daa068ff1b Mon Sep 17 00:00:00 2001 From: Stefan Scheu Date: Thu, 27 Apr 2023 12:01:07 +0200 Subject: [PATCH 1/3] fix: fix edit tooltip by checking parent element to prevent an early return --- .../Resources/public/js/pimcore/object/helpers/edit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js b/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js index 01bee53fd8e..60d1ccaf632 100644 --- a/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js +++ b/bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js @@ -403,7 +403,10 @@ pimcore.object.helpers.edit = { try { var el = this.getEl(); if(!el.hasCls("object_field")) { - el = el.parent(".object_field"); + var parentEl = el.parent(".object_field"); + if(parentEl !== null && parentEl !== undefined){ + el = parentEl; + } } } catch (e4) { console.log(e4); From ef298bac3075d88831db5536efdf925a4b3c2e1a Mon Sep 17 00:00:00 2001 From: Stefan Scheu Date: Thu, 27 Apr 2023 13:14:31 +0200 Subject: [PATCH 2/3] chore: revert magic changes --- .../AdminBundle/Controller/Searchadmin/SearchController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php index 5d7c7da863c..8b6c11e2fe2 100644 --- a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php +++ b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php @@ -50,11 +50,11 @@ class SearchController extends AdminController * @return JsonResponse * * @todo: $conditionTypeParts could be undefined - * + * @todo: $conditionSubtypeParts could be undefined - * + * @todo: $conditionClassnameParts could be undefined - * + * @todo: $data could be undefined */ public function findAction(Request $request, EventDispatcherInterface $eventDispatcher, GridHelperService $gridHelperService) From fd3307bc3369d087dc81614f645a6d9c12461267 Mon Sep 17 00:00:00 2001 From: Stefan Scheu Date: Thu, 27 Apr 2023 13:17:25 +0200 Subject: [PATCH 3/3] chore: revert magic changes --- .../AdminBundle/Controller/Searchadmin/SearchController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php index 8b6c11e2fe2..7988bcf9ae9 100644 --- a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php +++ b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php @@ -50,11 +50,8 @@ class SearchController extends AdminController * @return JsonResponse * * @todo: $conditionTypeParts could be undefined - * @todo: $conditionSubtypeParts could be undefined - * @todo: $conditionClassnameParts could be undefined - * @todo: $data could be undefined */ public function findAction(Request $request, EventDispatcherInterface $eventDispatcher, GridHelperService $gridHelperService)