Skip to content

Fix edit tooltips #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 10.5
Choose a base branch
from
Open

Fix edit tooltips #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00c71bf
fix: fix edit tooltip by checking parent element to prevent an early …
zoidbergx Apr 27, 2023
ef298ba
chore: revert magic changes
zoidbergx Apr 27, 2023
fd3307b
chore: revert magic changes
zoidbergx Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions bundles/AdminBundle/Controller/Searchadmin/SearchController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion bundles/AdminBundle/Resources/public/js/pimcore/object/helpers/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down