From ec021fb63bca48c3c4401afecff9a1743f1fe1ed Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 29 Oct 2024 21:41:58 +0200 Subject: [PATCH] ref --- .../DefaultLayouts/DefaultSidePanelType.php | 13 ++--- .../Espo/Core/Acl/OwnerUserFieldProvider.php | 27 ++++------ .../LinkMultiple/LinkMultipleFactory.php | 3 +- .../LinkMultiple/ListLoader.php | 5 +- .../FieldProcessing/LinkMultiple/Loader.php | 5 +- .../Functions/RecordGroup/FetchType.php | 3 +- .../Orm/FieldConverters/LinkMultiple.php | 2 +- .../Espo/Core/Utils/Database/Schema/Utils.php | 4 +- .../Modules/Crm/Tools/Calendar/Service.php | 4 +- .../Espo/Tools/Attachment/AccessChecker.php | 1 + application/Espo/Tools/Attachment/Checker.php | 17 ++----- .../Espo/Tools/Attachment/FieldType.php | 38 -------------- .../Espo/Tools/Attachment/UploadService.php | 1 + application/Espo/Tools/DataPrivacy/Erasor.php | 8 +-- .../Espo/Tools/EmailTemplate/Formatter.php | 51 ++++++++----------- .../EmailTemplate/InsertField/Service.php | 13 ++--- .../Format/Csv/AdditionalFieldsLoader.php | 5 +- .../Format/Xlsx/AdditionalFieldsLoader.php | 3 +- .../Export/Format/Xlsx/ParamsHandler.php | 2 +- .../Espo/Tools/MassUpdate/Processor.php | 2 +- 20 files changed, 81 insertions(+), 126 deletions(-) delete mode 100644 application/Espo/Tools/Attachment/FieldType.php diff --git a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php index 29302df1bc..f615bfacdd 100644 --- a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php +++ b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php @@ -31,6 +31,7 @@ namespace Espo\Classes\DefaultLayouts; use Espo\Core\ORM\Type\FieldType; use Espo\Core\Utils\Metadata; +use Espo\Entities\Team; use Espo\Entities\User; use stdClass; @@ -47,18 +48,18 @@ class DefaultSidePanelType $list = []; if ( - $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link' && - $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === 'User' + $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === FieldType::LINK && + $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === User::ENTITY_TYPE || - $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple' && - $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === 'User' + $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === FieldType::LINK_MULTIPLE && + $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === User::ENTITY_TYPE ) { $list[] = (object) ['name' => ':assignedUser']; } if ( - $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple' && - $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === 'Team' + $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === FieldType::LINK_MULTIPLE && + $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === Team::ENTITY_TYPE ) { $list[] = (object) ['name' => 'teams']; } diff --git a/application/Espo/Core/Acl/OwnerUserFieldProvider.php b/application/Espo/Core/Acl/OwnerUserFieldProvider.php index f945218a04..1cb078e8d8 100644 --- a/application/Espo/Core/Acl/OwnerUserFieldProvider.php +++ b/application/Espo/Core/Acl/OwnerUserFieldProvider.php @@ -29,27 +29,20 @@ namespace Espo\Core\Acl; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Utils\Metadata; +use Espo\Entities\User; use Espo\ORM\Defs; class OwnerUserFieldProvider { protected const FIELD_ASSIGNED_USERS = 'assignedUsers'; - protected const FIELD_ASSIGNED_USER = 'assignedUser'; - protected const FIELD_CREATED_BY = 'createdBy'; - private $ormDefs; - - private $metadata; - - public function __construct(Defs $ormDefs, Metadata $metadata) - { - $this->ormDefs = $ormDefs; - $this->metadata = $metadata; - } + public function __construct(private Defs $ormDefs, private Metadata $metadata) + {} /** * Get an entity field that stores an owner-user (or multiple users). @@ -67,27 +60,27 @@ class OwnerUserFieldProvider if ( $defs->hasField(self::FIELD_ASSIGNED_USERS) && - $defs->getField(self::FIELD_ASSIGNED_USERS)->getType() === 'linkMultiple' && + $defs->getField(self::FIELD_ASSIGNED_USERS)->getType() === FieldType::LINK_MULTIPLE && $defs->hasRelation(self::FIELD_ASSIGNED_USERS) && - $defs->getRelation(self::FIELD_ASSIGNED_USERS)->getForeignEntityType() === 'User' + $defs->getRelation(self::FIELD_ASSIGNED_USERS)->getForeignEntityType() === User::ENTITY_TYPE ) { return self::FIELD_ASSIGNED_USERS; } if ( $defs->hasField(self::FIELD_ASSIGNED_USER) && - $defs->getField(self::FIELD_ASSIGNED_USER)->getType() === 'link' && + $defs->getField(self::FIELD_ASSIGNED_USER)->getType() === FieldType::LINK && $defs->hasRelation(self::FIELD_ASSIGNED_USER) && - $defs->getRelation(self::FIELD_ASSIGNED_USER)->getForeignEntityType() === 'User' + $defs->getRelation(self::FIELD_ASSIGNED_USER)->getForeignEntityType() === User::ENTITY_TYPE ) { return self::FIELD_ASSIGNED_USER; } if ( $defs->hasField(self::FIELD_CREATED_BY) && - $defs->getField(self::FIELD_CREATED_BY)->getType() === 'link' && + $defs->getField(self::FIELD_CREATED_BY)->getType() === FieldType::LINK && $defs->hasRelation(self::FIELD_CREATED_BY) && - $defs->getRelation(self::FIELD_CREATED_BY)->getForeignEntityType() === 'User' + $defs->getRelation(self::FIELD_CREATED_BY)->getForeignEntityType() === User::ENTITY_TYPE ) { return self::FIELD_CREATED_BY; } diff --git a/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php index d30527a282..105099d474 100644 --- a/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php +++ b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php @@ -29,6 +29,7 @@ namespace Espo\Core\Field\LinkMultiple; +use Espo\Core\ORM\Type\FieldType; use Espo\ORM\Defs; use Espo\ORM\Entity; use Espo\ORM\EntityManager; @@ -57,7 +58,7 @@ class LinkMultipleFactory implements ValueFactory return false; } - return $entityDefs->getField($field)->getType() === 'linkMultiple'; + return $entityDefs->getField($field)->getType() === FieldType::LINK_MULTIPLE; } public function createFromEntity(Entity $entity, string $field): LinkMultiple diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php index 67a84508a2..5e2a493b08 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php @@ -29,6 +29,7 @@ namespace Espo\Core\FieldProcessing\LinkMultiple; +use Espo\Core\ORM\Type\FieldType; use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; use Espo\Core\FieldProcessing\Loader as LoaderInterface; @@ -92,8 +93,8 @@ class ListLoader implements LoaderInterface foreach ($entityDefs->getFieldList() as $fieldDefs) { if ( - $fieldDefs->getType() !== 'linkMultiple' && - $fieldDefs->getType() !== 'attachmentMultiple' + $fieldDefs->getType() !== FieldType::LINK_MULTIPLE && + $fieldDefs->getType() !== FieldType::ATTACHMENT_MULTIPLE ) { continue; } diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php index 39113b0ab2..c700911f3d 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php @@ -29,6 +29,7 @@ namespace Espo\Core\FieldProcessing\LinkMultiple; +use Espo\Core\ORM\Type\FieldType; use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; use Espo\Core\FieldProcessing\Loader as LoaderInterface; @@ -74,8 +75,8 @@ class Loader implements LoaderInterface foreach ($entityDefs->getFieldList() as $fieldDefs) { if ( - $fieldDefs->getType() !== 'linkMultiple' && - $fieldDefs->getType() !== 'attachmentMultiple' + $fieldDefs->getType() !== FieldType::LINK_MULTIPLE && + $fieldDefs->getType() !== FieldType::ATTACHMENT_MULTIPLE ) { continue; } diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FetchType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FetchType.php index e3f2ffbadb..afa90253dd 100644 --- a/application/Espo/Core/Formula/Functions/RecordGroup/FetchType.php +++ b/application/Espo/Core/Formula/Functions/RecordGroup/FetchType.php @@ -34,6 +34,7 @@ use Espo\Core\Formula\Exceptions\BadArgumentType; use Espo\Core\Formula\Exceptions\TooFewArguments; use Espo\Core\Formula\Func; use Espo\Core\ORM\Entity as CoreEntity; +use Espo\Core\ORM\Type\FieldType; use Espo\ORM\Entity; use Espo\ORM\EntityManager; use stdClass; @@ -84,7 +85,7 @@ class FetchType implements Func foreach ($fieldDefsList as $fieldDefs) { $field = $fieldDefs->getName(); - if ($fieldDefs->getType() === 'linkMultiple' && $entity->hasLinkMultipleField($field)) { + if ($fieldDefs->getType() === FieldType::LINK_MULTIPLE && $entity->hasLinkMultipleField($field)) { $entity->loadLinkMultipleField($field); } } diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/LinkMultiple.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/LinkMultiple.php index a9f2e0c5a9..e3e2d733b8 100644 --- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/LinkMultiple.php +++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/LinkMultiple.php @@ -55,7 +55,7 @@ class LinkMultiple implements FieldConverter 'relation' => $name, 'isUnordered' => true, 'attributeRole' => 'idList', - 'fieldType' => 'linkMultiple', + 'fieldType' => FieldType::LINK_MULTIPLE, ]); /** @var array $defaults */ diff --git a/application/Espo/Core/Utils/Database/Schema/Utils.php b/application/Espo/Core/Utils/Database/Schema/Utils.php index 08f32c0913..94b0989d1f 100644 --- a/application/Espo/Core/Utils/Database/Schema/Utils.php +++ b/application/Espo/Core/Utils/Database/Schema/Utils.php @@ -29,6 +29,7 @@ namespace Espo\Core\Utils\Database\Schema; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Utils\Util; use Espo\ORM\Defs\IndexDefs; @@ -127,7 +128,7 @@ class Utils ) { $permittedFieldTypeList = [ - 'varchar', + FieldType::VARCHAR, ]; $fields = []; @@ -203,7 +204,6 @@ class Utils $type = self::getDbFieldType($ormFieldDefs); $length = $defaultLength[$type] ?? $length; - //$length = isset($ormFieldDefs['len']) ? $ormFieldDefs['len'] : $length; switch ($type) { case 'varchar': diff --git a/application/Espo/Modules/Crm/Tools/Calendar/Service.php b/application/Espo/Modules/Crm/Tools/Calendar/Service.php index dcac84dab6..cd802402ba 100644 --- a/application/Espo/Modules/Crm/Tools/Calendar/Service.php +++ b/application/Espo/Modules/Crm/Tools/Calendar/Service.php @@ -37,6 +37,7 @@ use Espo\Core\Exceptions\Error; use Espo\Core\Exceptions\Forbidden; use Espo\Core\Exceptions\NotFound; use Espo\Core\Field\DateTime as DateTimeField; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Select\Helpers\RelationQueryHelper; use Espo\Core\Select\SelectBuilderFactory; use Espo\Core\Utils\Config; @@ -523,7 +524,8 @@ class Service } if ( - $this->metadata->get(['entityDefs', 'Task', 'fields', 'assignedUsers', 'type']) === 'linkMultiple' && + $this->metadata->get(['entityDefs', 'Task', 'fields', 'assignedUsers', 'type']) === + FieldType::LINK_MULTIPLE && !$this->metadata->get(['entityDefs', 'Task', 'fields', 'assignedUsers', 'disabled']) ) { $queryBuilder->where( diff --git a/application/Espo/Tools/Attachment/AccessChecker.php b/application/Espo/Tools/Attachment/AccessChecker.php index dba4282bf2..111bdd16ea 100644 --- a/application/Espo/Tools/Attachment/AccessChecker.php +++ b/application/Espo/Tools/Attachment/AccessChecker.php @@ -36,6 +36,7 @@ use Espo\Core\Utils\Metadata; use Espo\Entities\Attachment; use Espo\Entities\Settings; use Espo\Entities\User; +use Espo\Core\ORM\Type\FieldType; class AccessChecker { diff --git a/application/Espo/Tools/Attachment/Checker.php b/application/Espo/Tools/Attachment/Checker.php index 26f2bbd239..628edc0f61 100644 --- a/application/Espo/Tools/Attachment/Checker.php +++ b/application/Espo/Tools/Attachment/Checker.php @@ -34,22 +34,15 @@ use Espo\Core\Exceptions\ForbiddenSilent; use Espo\Core\Utils\File\MimeType; use Espo\Core\Utils\Metadata; use Espo\Entities\Attachment; +use Espo\Core\ORM\Type\FieldType; class Checker { - private Metadata $metadata; - private MimeType $mimeType; - private DetailsObtainer $detailsObtainer; - public function __construct( - Metadata $metadata, - MimeType $mimeType, - DetailsObtainer $detailsObtainer - ) { - $this->metadata = $metadata; - $this->mimeType = $mimeType; - $this->detailsObtainer = $detailsObtainer; - } + private Metadata $metadata, + private MimeType $mimeType, + private DetailsObtainer $detailsObtainer + ) {} /** * Check a mine-type for allowance. diff --git a/application/Espo/Tools/Attachment/FieldType.php b/application/Espo/Tools/Attachment/FieldType.php deleted file mode 100644 index 09b0049166..0000000000 --- a/application/Espo/Tools/Attachment/FieldType.php +++ /dev/null @@ -1,38 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Tools\Attachment; - -class FieldType -{ - public const FILE = 'file'; - public const IMAGE = 'image'; - public const ATTACHMENT_MULTIPLE = 'attachmentMultiple'; - public const WYSIWYG = 'wysiwyg'; -} diff --git a/application/Espo/Tools/Attachment/UploadService.php b/application/Espo/Tools/Attachment/UploadService.php index 13f96bfdac..01746e0203 100644 --- a/application/Espo/Tools/Attachment/UploadService.php +++ b/application/Espo/Tools/Attachment/UploadService.php @@ -45,6 +45,7 @@ use Espo\Entities\Attachment; use Espo\ORM\EntityManager; use Espo\Repositories\Attachment as AttachmentRepository; use Espo\Tools\Attachment\Jobs\MoveToStorage; +use Espo\Core\ORM\Type\FieldType; class UploadService { diff --git a/application/Espo/Tools/DataPrivacy/Erasor.php b/application/Espo/Tools/DataPrivacy/Erasor.php index e324fe7d2a..dd16182fb2 100644 --- a/application/Espo/Tools/DataPrivacy/Erasor.php +++ b/application/Espo/Tools/DataPrivacy/Erasor.php @@ -35,9 +35,11 @@ use Espo\Core\Exceptions\Forbidden; use Espo\Core\Exceptions\NotFound; use Espo\Core\FieldProcessing\EmailAddress\AccessChecker as EmailAddressAccessChecker; use Espo\Core\FieldProcessing\PhoneNumber\AccessChecker as PhoneNumberAccessChecker; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Record\ServiceContainer as RecordServiceContainer; use Espo\Core\Di; +use Espo\Entities\Attachment; class Erasor implements @@ -139,17 +141,17 @@ class Erasor implements $entity->clear($field . 'Data'); continue; - } else if ($type === 'file' || $type === 'image') { + } else if ($type === FieldType::FILE || $type === FieldType::IMAGE) { $attachmentId = $entity->get($field . 'Id'); if ($attachmentId) { - $attachment = $this->entityManager->getEntityById('Attachment', $attachmentId); + $attachment = $this->entityManager->getEntityById(Attachment::ENTITY_TYPE, $attachmentId); if ($attachment) { $this->entityManager->removeEntity($attachment); } } - } else if ($type === 'attachmentMultiple') { + } else if ($type === FieldType::ATTACHMENT_MULTIPLE) { $attachmentList = $entity->get($field); foreach ($attachmentList as $attachment) { diff --git a/application/Espo/Tools/EmailTemplate/Formatter.php b/application/Espo/Tools/EmailTemplate/Formatter.php index 75a707f738..5fdb8cbc6e 100644 --- a/application/Espo/Tools/EmailTemplate/Formatter.php +++ b/application/Espo/Tools/EmailTemplate/Formatter.php @@ -29,37 +29,26 @@ namespace Espo\Tools\EmailTemplate; +use Espo\Core\ORM\Type\FieldType; use Espo\ORM\Entity; - use Espo\Core\Utils\Metadata; use Espo\Core\Utils\Config; use Espo\Core\Utils\DateTime as DateTimeUtil; use Espo\Core\Utils\NumberUtil; use Espo\Core\Utils\Language; +use Espo\ORM\Type\AttributeType; use Stringable; class Formatter { - private Metadata $metadata; - private Config $config; - private DateTimeUtil $dateTime; - private NumberUtil $number; - private Language $language; - public function __construct( - Metadata $metadata, - Config $config, - DateTimeUtil $dateTime, - NumberUtil $number, - Language $language - ) { - $this->metadata = $metadata; - $this->config = $config; - $this->dateTime = $dateTime; - $this->number = $number; - $this->language = $language; - } + private Metadata $metadata, + private Config $config, + private DateTimeUtil $dateTime, + private NumberUtil $number, + private Language $language + ) {} public function formatAttributeValue(Entity $entity, string $attribute, bool $isPlainText = false): ?string { @@ -88,7 +77,11 @@ class Formatter return $label; } - if ($fieldType === 'array' || $fieldType === 'multiEnum' || $fieldType === 'checklist') { + if ( + $fieldType === FieldType::ARRAY || + $fieldType === FieldType::MULTI_ENUM || + $fieldType === FieldType::CHECKLIST + ) { $valueList = []; if (!is_array($value)) { @@ -102,7 +95,7 @@ class Formatter return implode(', ', $valueList); } - if ($attributeType === 'date') { + if ($attributeType === AttributeType::DATE) { if (!$value) { return ''; } @@ -110,7 +103,7 @@ class Formatter return $this->dateTime->convertSystemDate($value); } - if ($attributeType === 'datetime') { + if ($attributeType === AttributeType::DATETIME) { if (!$value) { return ''; } @@ -118,12 +111,12 @@ class Formatter return $this->dateTime->convertSystemDateTime($value); } - if ($attributeType === 'text') { + if ($attributeType === AttributeType::TEXT) { if (!is_string($value)) { return ''; } - if ($fieldType === 'wysiwyg') { + if ($fieldType === FieldType::WYSIWYG) { return $value; } @@ -134,28 +127,28 @@ class Formatter return nl2br($value); } - if ($attributeType === 'float') { + if ($attributeType === AttributeType::FLOAT) { if (!is_float($value)) { return ''; } $decimalPlaces = 2; - if ($fieldType === 'currency') { + if ($fieldType === FieldType::CURRENCY) { $decimalPlaces = $this->config->get('currencyDecimalPlaces'); } return $this->number->format($value, $decimalPlaces); } - if ($attributeType === 'int') { + if ($attributeType === AttributeType::INT) { if (!is_int($value)) { return ''; } if ( - $fieldType === 'autoincrement' || - $fieldType === 'int' && + $fieldType === FieldType::AUTOINCREMENT || + $fieldType === FieldType::INT && $this->metadata ->get(['entityDefs', $entity->getEntityType(), 'fields', $attribute, 'disableFormatting']) ) { diff --git a/application/Espo/Tools/EmailTemplate/InsertField/Service.php b/application/Espo/Tools/EmailTemplate/InsertField/Service.php index 35ea108865..e0cf0627cf 100644 --- a/application/Espo/Tools/EmailTemplate/InsertField/Service.php +++ b/application/Espo/Tools/EmailTemplate/InsertField/Service.php @@ -32,6 +32,7 @@ namespace Espo\Tools\EmailTemplate\InsertField; use Espo\Core\Acl; use Espo\Core\Acl\Table; use Espo\Core\Exceptions\Forbidden; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Record\ServiceContainer; use Espo\Core\Utils\FieldUtil; use Espo\Entities\Email; @@ -120,13 +121,13 @@ class Service $recordService->prepareEntityForOutput($e); $ignoreTypeList = [ - 'image', - 'file', + FieldType::IMAGE, + FieldType::FILE, + FieldType::WYSIWYG, + FieldType::LINK_MULTIPLE, + FieldType::ATTACHMENT_MULTIPLE, + FieldType::BOOL, 'map', - 'wysiwyg', - 'linkMultiple', - 'attachmentMultiple', - 'bool', ]; foreach ($fm->getEntityTypeFieldList($entityType) as $field) { diff --git a/application/Espo/Tools/Export/Format/Csv/AdditionalFieldsLoader.php b/application/Espo/Tools/Export/Format/Csv/AdditionalFieldsLoader.php index f8db2294c3..b12d2dd045 100644 --- a/application/Espo/Tools/Export/Format/Csv/AdditionalFieldsLoader.php +++ b/application/Espo/Tools/Export/Format/Csv/AdditionalFieldsLoader.php @@ -30,6 +30,7 @@ namespace Espo\Tools\Export\Format\Csv; use Espo\Core\ORM\Entity as CoreEntity; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Utils\Metadata; use Espo\ORM\Entity; use Espo\Tools\Export\AdditionalFieldsLoader as AdditionalFieldsLoaderInterface; @@ -52,8 +53,8 @@ class AdditionalFieldsLoader implements AdditionalFieldsLoaderInterface ->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']); if ( - $fieldType === 'linkMultiple' || - $fieldType === 'attachmentMultiple' + $fieldType === FieldType::LINK_MULTIPLE || + $fieldType === FieldType::ATTACHMENT_MULTIPLE ) { if (!$entity->has($field . 'Ids') && $entity->hasLinkMultipleField($field)) { $entity->loadLinkMultipleField($field); diff --git a/application/Espo/Tools/Export/Format/Xlsx/AdditionalFieldsLoader.php b/application/Espo/Tools/Export/Format/Xlsx/AdditionalFieldsLoader.php index af08f2a213..b23e50933a 100644 --- a/application/Espo/Tools/Export/Format/Xlsx/AdditionalFieldsLoader.php +++ b/application/Espo/Tools/Export/Format/Xlsx/AdditionalFieldsLoader.php @@ -30,6 +30,7 @@ namespace Espo\Tools\Export\Format\Xlsx; use Espo\Core\ORM\Entity as CoreEntity; +use Espo\Core\ORM\Type\FieldType; use Espo\Core\Utils\Metadata; use Espo\ORM\Entity; use Espo\Tools\Export\AdditionalFieldsLoader as AdditionalFieldsLoaderInterface; @@ -77,7 +78,7 @@ class AdditionalFieldsLoader implements AdditionalFieldsLoaderInterface $fieldType = $this->metadata ->get(['entityDefs', $entity->getEntityType(), 'fields', $field, 'type']); - if ($fieldType === 'linkMultiple' || $fieldType === 'attachmentMultiple') { + if ($fieldType === FieldType::LINK_MULTIPLE || $fieldType === FieldType::ATTACHMENT_MULTIPLE) { if (!$entity->has($field . 'Ids') && $entity->hasLinkMultipleField($field)) { $entity->loadLinkMultipleField($field); } diff --git a/application/Espo/Tools/Export/Format/Xlsx/ParamsHandler.php b/application/Espo/Tools/Export/Format/Xlsx/ParamsHandler.php index 4b7e067e2a..cc9633d3ff 100644 --- a/application/Espo/Tools/Export/Format/Xlsx/ParamsHandler.php +++ b/application/Espo/Tools/Export/Format/Xlsx/ParamsHandler.php @@ -71,7 +71,7 @@ class ParamsHandler implements ProcessorParamsHandler foreach ($fieldList as $i => $field) { $type = $this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'type']); - if (in_array($type, ['linkMultiple', 'attachmentMultiple'])) { + if (in_array($type, [FieldType::LINK_MULTIPLE, FieldType::ATTACHMENT_MULTIPLE])) { unset($fieldList[$i]); } } diff --git a/application/Espo/Tools/MassUpdate/Processor.php b/application/Espo/Tools/MassUpdate/Processor.php index 4360e9b1dd..051b42931f 100644 --- a/application/Espo/Tools/MassUpdate/Processor.php +++ b/application/Espo/Tools/MassUpdate/Processor.php @@ -50,8 +50,8 @@ use Espo\ORM\Entity; use Espo\Repositories\Attachment as AttachmentRepository; use Espo\Entities\User; use Espo\Entities\Attachment; +use Espo\Core\ORM\Type\FieldType; -use Espo\Tools\Attachment\FieldType; use Exception; use RuntimeException; use stdClass;