viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

duplicates use preapre entity for output

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-05-02 09:57:58 +03:00
parent d522eab8f5
commit 0c0e118ea2
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/Espo/Core/Formula/Functions/RecordServiceGroup/ThrowDuplicateConflictType.php
View File

@@ -31,15 +31,20 @@ namespace Espo\Core\Formula\Functions\RecordServiceGroup;
use Espo\Core\Di\EntityManagerAware;
use Espo\Core\Di\EntityManagerSetter;
use Espo\Core\Di\RecordServiceContainerAware;
use Espo\Core\Di\RecordServiceContainerSetter;
use Espo\Core\Exceptions\Conflict;
use Espo\Core\Exceptions\ConflictSilent;
use Espo\Core\Formula\ArgumentList;
use Espo\Core\Formula\Functions\BaseFunction;
use Espo\Core\Utils\Json;
class ThrowDuplicateConflictType extends BaseFunction implements EntityManagerAware
class ThrowDuplicateConflictType extends BaseFunction implements
EntityManagerAware,
RecordServiceContainerAware
{
use EntityManagerSetter;
use RecordServiceContainerSetter;
/**
* @inheritDoc
@@ -72,10 +77,16 @@ class ThrowDuplicateConflictType extends BaseFunction implements EntityManagerAw
foreach ($ids as $id) {
$entity = $this->entityManager->getEntityById($entityType, $id);
$name = $entity ? $entity->get('name') : $id;
if ($entity) {
$this->recordServiceContainer->get($entityType)->prepareEntityForOutput($entity);
}
if (!$entity) {
$entity = $this->entityManager->getNewEntity($entityType);
$entity->set('name', $id);
}
$list[] = (object) ['id' => $id, 'name' => $name];
$list[] = $entity->getValueMap();
}
throw ConflictSilent::createWithBody('duplicate', Json::encode($list));

15
application/Espo/Core/Record/Service.php
View File

@@ -564,22 +564,17 @@ class Service implements Crud,
*/
protected function processDuplicateCheck(Entity $entity): void
{
$duplicateList = $this->findDuplicates($entity);
$duplicates = $this->findDuplicates($entity);
if (empty($duplicateList)) {
if (!$duplicates) {
return;
}
$list = [];
foreach ($duplicateList as $e) {
$list[] = (object) [
'id' => $e->getId(),
'name' => $e->get('name'),
];
foreach ($duplicates as $e) {
$this->prepareEntityForOutput($e);
}
throw ConflictSilent::createWithBody('duplicate', Json::encode($list));
throw ConflictSilent::createWithBody('duplicate', Json::encode($duplicates->getValueMapList()));
}
/**