Skip to content

Commit 53607a6

Browse files
author
Minh Le
committed
updated query to be compatible with pimcore 10
1 parent 2e7ecbe commit 53607a6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Model/DataObject/ClassDefinition/Data/ObjectBridge.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public function getDataFromEditmode($data, $object = null, $params = [])
382382
/** @var AbstractObject|string $bridgeClass */
383383
$bridgeClass = $this->getBridgeFullClassName();
384384
$idSourceFieldKey = $sourceClassDef->getName() . '_id';
385-
385+
386386
foreach ($data as $objectData) {
387387
$sourceId = $objectData[$idSourceFieldKey];
388388
$bridgeObjectId = $this->getBridgeIdBySourceAndOwner($object, $bridgeClass, $sourceId);
@@ -542,11 +542,13 @@ private function getBridgeFullClassName()
542542
private function getBridgeIdBySourceAndOwner($object, $bridgeClass, $sourceId)
543543
{
544544
$db = Db::get();
545-
$select = $db->select()
546-
->from(['dor' => 'object_relations_' . $object::classId()], [])
547-
->joinInner(['dp_objects' => 'object_' . $bridgeClass::classId()], 'dor.dest_id = dp_objects.oo_id', ['oo_id'])
548-
->where('dor.src_id = ?', $object->getId())
549-
->where('dp_objects.' . $this->bridgeField . '__id = ?', $sourceId);
545+
$select = $db->createQueryBuilder()
546+
->select("dp_objects.oo_id")
547+
->from('object_relations_' . $object::classId(), 'dor')
548+
->innerJoin('dor', 'object_' . $bridgeClass::classId(), 'dp_objects', 'dor.dest_id = dp_objects.oo_id AND dor.type = "object"')
549+
// ->joinInner(['dp_objects' => 'object_' . $bridgeClass::classId()], 'dor.dest_id = dp_objects.oo_id AND dor.type = "object"', ['oo_id'])
550+
->where('dor.src_id = ' . $object->getId())
551+
->andWhere('dp_objects.' . $this->bridgeField . '__id = ' . $sourceId);
550552

551553

552554
$stmt = $db->query($select);
@@ -920,7 +922,6 @@ public function synchronizeWithMasterDefinition(ClassDefinition\Data $masterDefi
920922
$this->bridgeAllowedClassName = $masterDefinition->bridgeAllowedClassName;
921923
$this->bridgeVisibleFields = $masterDefinition->bridgeVisibleFields;
922924
$this->sourceHiddenFields = $masterDefinition->sourceHiddenFields;
923-
$this->bridgeVisibleFields = $masterDefinition->bridgeVisibleFields;
924925
$this->bridgeHiddenFields = $masterDefinition->bridgeHiddenFields;
925926
$this->bridgeField = $masterDefinition->bridgeField;
926927
$this->bridgeFolder = $masterDefinition->bridgeFolder;

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Allows editing an object inline that doesn't link directly many-to-many like",
44
"type": "pimcore-bundle",
55
"require": {
6-
"pimcore/pimcore": ">=5.6.0"
6+
"pimcore/pimcore": "^10.5"
77
},
88
"license": "MIT",
99
"authors": [

0 commit comments

Comments
 (0)