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

email do not set sent by if draft

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-11-09 10:54:26 +02:00
parent d7174c916e
commit 3443db832c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/Espo/Entities/Email.php
View File

@@ -717,6 +717,11 @@ class Email extends Entity
return $this->getValueObject('sentBy');
}
public function setSentBy(Link|User|null $sentBy): self
{
return $this->setRelatedLinkOrEntity('sentBy', $sentBy);
}
public function getGroupFolder(): ?Link
{
/** @var ?Link */

4
application/Espo/Repositories/Email.php
View File

@@ -333,6 +333,7 @@ class Email extends Database implements
$this->addUserByEmailAddressId($entity, $ids[0], true);
if (!$entity->getSentBy()) {
/** @var UserEntity $user */
$user = $this->getEmailAddressRepository()
->getEntityByAddressId(
$entity->get('fromEmailAddressId'),
@@ -340,7 +341,8 @@ class Email extends Database implements
true
);
if ($user) {
if ($user && $entity->getStatus() !== EmailEntity::STATUS_DRAFT) {
$entity->setSentBy($user);
$entity->set('sentById', $user->getId());
}
}