@@ -382,7 +382,7 @@ public function getDataFromEditmode($data, $object = null, $params = [])
382
382
/** @var AbstractObject|string $bridgeClass */
383
383
$ bridgeClass = $ this ->getBridgeFullClassName ();
384
384
$ idSourceFieldKey = $ sourceClassDef ->getName () . '_id ' ;
385
-
385
+
386
386
foreach ($ data as $ objectData ) {
387
387
$ sourceId = $ objectData [$ idSourceFieldKey ];
388
388
$ bridgeObjectId = $ this ->getBridgeIdBySourceAndOwner ($ object , $ bridgeClass , $ sourceId );
@@ -542,11 +542,13 @@ private function getBridgeFullClassName()
542
542
private function getBridgeIdBySourceAndOwner ($ object , $ bridgeClass , $ sourceId )
543
543
{
544
544
$ 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 );
550
552
551
553
552
554
$ stmt = $ db ->query ($ select );
@@ -920,7 +922,6 @@ public function synchronizeWithMasterDefinition(ClassDefinition\Data $masterDefi
920
922
$ this ->bridgeAllowedClassName = $ masterDefinition ->bridgeAllowedClassName ;
921
923
$ this ->bridgeVisibleFields = $ masterDefinition ->bridgeVisibleFields ;
922
924
$ this ->sourceHiddenFields = $ masterDefinition ->sourceHiddenFields ;
923
- $ this ->bridgeVisibleFields = $ masterDefinition ->bridgeVisibleFields ;
924
925
$ this ->bridgeHiddenFields = $ masterDefinition ->bridgeHiddenFields ;
925
926
$ this ->bridgeField = $ masterDefinition ->bridgeField ;
926
927
$ this ->bridgeFolder = $ masterDefinition ->bridgeFolder ;
0 commit comments