diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php index 224ca85cb10962db759c349812528f8ea8f2e8cf..c4f0fe9e52aae8f23063017f4b09c5574229c0a9 100755 --- a/src/app/action/controllers/PreProcessActionController.php +++ b/src/app/action/controllers/PreProcessActionController.php @@ -438,8 +438,13 @@ class PreProcessActionController } if (is_array($data['resources']) && count($data['resources']) == 1) { - $resDestination = ResModel::getById(['select' => ['destination'], 'resId' => $data['resources'][0]]); - $additionalsInfos['destination'] = $resDestination['destination']; + $resDestination = ResModel::getById([ + 'select' => ['entities.id'], + 'table' => ['entities'], + 'leftJoin' => ['res_letterbox.destination = entities.entity_id'], + 'resId' => $data['resources'][0] + ]); + $additionalsInfos['destinationId'] = $resDestination['id']; } foreach ($data['resources'] as $resId) { diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php index 80257ece28f0084a6b7135a64b341008ab4118cd..10295c4481e91be55770cf2f98760481b4343737 100755 --- a/src/app/resource/models/ResModelAbstract.php +++ b/src/app/resource/models/ResModelAbstract.php @@ -80,7 +80,8 @@ abstract class ResModelAbstract $aResources = DatabaseModel::select([ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'], - 'table' => ['res_letterbox'], + 'table' => array_merge(['res_letterbox'], $aArgs['table']), + 'left_join' => empty($aArgs['leftJoin']) ? [] : $aArgs['leftJoin'], 'where' => ['res_id = ?'], 'data' => [$aArgs['resId']] ]);