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

ref

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-09-10 14:00:35 +03:00
parent 7ee08a6713
commit fe4a90ed97
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
+8 -9
View File
@@ -416,9 +416,8 @@ class Saver implements SaverInterface
if ($emailAddressOld) {
$this->entityManager
->getRDBRepository($entity->getEntityType())
->unrelate($entity, 'emailAddresses', $emailAddressOld, [
SaveOption::SKIP_HOOKS => true,
]);
->getRelation($entity, 'emailAddresses')
->unrelate($emailAddressOld, [SaveOption::SKIP_HOOKS => true]);
}
}
}
@@ -490,15 +489,15 @@ class Saver implements SaverInterface
$emailAddressOld = $this->getByAddress($emailAddressValueOld);
if ($emailAddressOld) {
$entityRepository->unrelate($entity, 'emailAddresses', $emailAddressOld, [
SaveOption::SKIP_HOOKS => true,
]);
$entityRepository
->getRelation($entity, 'emailAddresses')
->unrelate($emailAddressOld, [SaveOption::SKIP_HOOKS => true]);
}
}
$entityRepository->relate($entity, 'emailAddresses', $emailAddressNew, null, [
SaveOption::SKIP_HOOKS => true,
]);
$entityRepository
->getRelation($entity, 'emailAddresses')
->relate($emailAddressNew, null, [SaveOption::SKIP_HOOKS => true]);
if ($entity->has('emailAddressIsOptedOut')) {
$this->markAddressOptedOut($emailAddressValue, (bool) $entity->get('emailAddressIsOptedOut'));
application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
+10 -14
View File
@@ -411,7 +411,7 @@ class Saver implements SaverInterface
return;
}
$phoneNumberValue = trim($entity->get('phoneNumber'));
$phoneNumberValue = trim($entity->get('phoneNumber') ?? '');
$entityRepository = $this->entityManager->getRDBRepository($entity->getEntityType());
@@ -425,8 +425,6 @@ class Saver implements SaverInterface
])
->findOne();
$isNewPhoneNumber = false;
if (!$phoneNumberNew) {
$phoneNumberNew = $this->entityManager->getNewEntity(PhoneNumber::ENTITY_TYPE);
@@ -446,8 +444,6 @@ class Saver implements SaverInterface
$phoneNumberNew->set('type', $defaultType);
$this->entityManager->saveEntity($phoneNumberNew);
$isNewPhoneNumber = true;
}
$phoneNumberValueOld = $entity->getFetched('phoneNumber');
@@ -456,15 +452,15 @@ class Saver implements SaverInterface
$phoneNumberOld = $this->getByNumber($phoneNumberValueOld);
if ($phoneNumberOld) {
$entityRepository->unrelate($entity, 'phoneNumbers', $phoneNumberOld, [
SaveOption::SKIP_HOOKS => true,
]);
$entityRepository
->getRelation($entity, 'phoneNumbers')
->unrelate($phoneNumberOld, [SaveOption::SKIP_HOOKS => true]);
}
}
$entityRepository->relate($entity, 'phoneNumbers', $phoneNumberNew, null, [
SaveOption::SKIP_HOOKS => true,
]);
$entityRepository
->getRelation($entity, 'phoneNumbers')
->relate($phoneNumberNew, null, [SaveOption::SKIP_HOOKS => true]);
if ($entity->has('phoneNumberIsOptedOut')) {
$this->markNumberOptedOut($phoneNumberValue, (bool) $entity->get('phoneNumberIsOptedOut'));
@@ -527,9 +523,9 @@ class Saver implements SaverInterface
$phoneNumberOld = $this->getByNumber($phoneNumberValueOld);
if ($phoneNumberOld) {
$entityRepository->unrelate($entity, 'phoneNumbers', $phoneNumberOld, [
SaveOption::SKIP_HOOKS => true,
]);
$entityRepository
->getRelation($entity, 'phoneNumbers')
->unrelate($phoneNumberOld, [SaveOption::SKIP_HOOKS => true]);
}
}
}