Skip to content

EspoCRM – Open Source CRM Application

Additional attachmetn-multiple field check

Yuriib2df692199e1
diff --git a/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php b/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php
index 578d03f954..b644b1ece3 100644
--- a/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php
+++ b/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php
@@ -29,38 +29,43 @@
namespace Espo\Classes\FieldDuplicators;
+use Espo\Core\Acl;
+use Espo\Core\Name\Field;
use Espo\Core\Record\Duplicator\FieldDuplicator;
use Espo\ORM\Entity;
+use Espo\ORM\EntityCollection;
use Espo\ORM\EntityManager;
-
use Espo\Repositories\Attachment as AttachmentRepository;
use Espo\Entities\Attachment;
-
use stdClass;
+/**
+ * @noinspection PhpUnused
+ */
class AttachmentMultiple implements FieldDuplicator
{
- private $entityManager;
-
- public function __construct(EntityManager $entityManager)
- {
- $this->entityManager = $entityManager;
- }
+ public function __construct(
+ private EntityManager $entityManager,
+ private Acl $acl,
+ ) {}
public function duplicate(Entity $entity, string $field): stdClass
{
- $valueMap = (object) [];
+ if (!$this->acl->checkField($entity->getEntityType(), Field::ATTACHMENTS)) {
+ return (object) [];
+ }
- /** @var \Espo\ORM\Collection<Attachment> $attachmentList */
+ /** @var EntityCollection<Attachment> $attachmentList */
$attachmentList = $this->entityManager
- ->getRDBRepository($entity->getEntityType())
->getRelation($entity, $field)
->find();
- if (is_countable($attachmentList) && !count($attachmentList)) {
- return $valueMap;
+ if (!count($attachmentList)) {
+ return (object) [];
}
+ $valueMap = (object) [];
+
$idList = [];
$nameHash = (object) [];
$typeHash = (object) [];
diff --git a/application/Espo/Core/Name/Field.php b/application/Espo/Core/Name/Field.php
index c073600332..a9bf77c685 100644
--- a/application/Espo/Core/Name/Field.php
+++ b/application/Espo/Core/Name/Field.php
@@ -65,4 +65,9 @@ class Field
* @since 10.0.0
*/
public const string PIPELINE_STAGE = 'pipelineStage';
+
+ /**
+ * @since 10.10.0
+ */
+ public const string ATTACHMENTS = 'attachments';
}
diff --git a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
index 1d7ce0f942..a8f8ce4225 100644
--- a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
+++ b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
@@ -200,6 +200,10 @@ class ConvertService
}
if ($type === FieldType::ATTACHMENT_MULTIPLE) {
+ if (!$this->acl->checkField(Lead::ENTITY_TYPE, $field)) {
+ continue;
+ }
+
/** @var Collection<Attachment> & Countable $attachmentList */
$attachmentList = $this->entityManager
->getRelation($lead, $leadField)