espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix stream parent fields load

Browse Source
This commit is contained in:
yuri
2018-04-05 11:35:45 +03:00
parent 3c0d445824
commit a4aecee18d
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Services/Stream.php
+13 -20
View File
@@ -527,16 +527,10 @@ class Stream extends \Espo\Core\Services\Base
foreach ($collection as $e) {
if ($e->get('parentId') && $e->get('parentType')) {
$entity = $this->getEntityManager()->getEntity($e->get('parentType'), $e->get('parentId'));
if ($entity) {
$e->set('parentName', $entity->get('name'));
}
$e->loadParentNameField('parent');
}
if ($e->get('relatedId') && $e->get('relatedType')) {
$entity = $this->getEntityManager()->getEntity($e->get('relatedType'), $e->get('relatedId'));
if ($entity) {
$e->set('relatedName', $entity->get('name'));
}
$e->loadParentNameField('related');
}
if ($e->get('type') == 'Post' && $e->get('parentId') === null && !$e->get('isGlobal')) {
$targetType = $e->get('targetType');
@@ -658,17 +652,11 @@ class Stream extends \Espo\Core\Services\Base
($e->get('parentId') != $id) ||
($e->get('parentType') != $scope)
) {
$parent = $this->getEntityManager()->getEntity($e->get('parentType'), $e->get('parentId'));
if ($parent) {
$e->set('parentName', $parent->get('name'));
}
$e->loadParentNameField('parent');
}
}
if ($e->get('relatedId') && $e->get('relatedType')) {
$entity = $this->getEntityManager()->getEntity($e->get('relatedType'), $e->get('relatedId'));
if ($entity) {
$e->set('relatedName', $entity->get('name'));
}
$e->loadParentNameField('related');
}
}
@@ -1003,9 +991,11 @@ class Stream extends \Espo\Core\Services\Base
$wasParentType = $was[$field . 'Type'];
$wasParentId = $was[$field . 'Id'];
if ($wasParentType && $wasParentId) {
$wasParent = $this->getEntityManager()->getEntity($wasParentType, $wasParentId);
if ($wasParent) {
$was[$field . 'Name'] = $wasParent->get('name');
if ($this->getEntityManager()->hasRepository($wasParentType)) {
$wasParent = $this->getEntityManager()->getEntity($wasParentType, $wasParentId);
if ($wasParent) {
$was[$field . 'Name'] = $wasParent->get('name');
}
}
}
}
@@ -1023,7 +1013,7 @@ class Stream extends \Espo\Core\Services\Base
'fields' => $updatedFieldList,
'attributes' => array(
'was' => $was,
'became' => $became,
'became' => $became
)
));
@@ -1127,6 +1117,9 @@ class Stream extends \Espo\Core\Services\Base
if (empty($data->entityId) || empty($data->entityType)) {
return;
}
if (!$this->getEntityManager()->hasRepository($data->entityType)) return;
$entity = $this->getEntityManager()->getEntity($data->entityType, $data->entityId);
if (!$entity) return;